Problems with mixed Mime Type mp3 and aac

[eismeraldo]

For testing purposes, I defined an Internet radio with 5 URLs, three with Mime Type mp3 and two with acc. To solve the Mime Type mix, I use the MultiDecoder. If I play one of the defined acc URLs, everything works fine. However, as soon as I iterate through the mixed URL list, the aac URLs no longer work, the mp3s work without any problems.
I have a test program variant with the ICYStream.begin() without specifying the Mime Type and one with passing the Mime Type. Both program variants have the same problem, the aac URLs are not played.

What am I doing wrong? Thanks for the help

Testprogram Variante 1

#include "AudioTools.h"
#include "AudioTools/AudioCodecs/CodecAACHelix.h"
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
// #include <Command.h>
// #include <CommandProducer.h>
#include <Secret.hpp>
// #include <SerialCommand.h>
// #include <general-tools.h>

#include <cstdint>

enum COMMAND { NONE, PAUSE, RESUME, NEXT, BACK, SELECT };

struct command_t {
    COMMAND command;
    int8_t  value;
};

// clang-format off
const char *urls[] = {
    "http://stream.srg-ssr.ch/m/regi_zh_sh/mp3_128", // ind 0; Radio SRF 1 Regionaljournal Zürich, Schaffhausen
    "https://radiotop.ice.infomaniak.ch/radiotop96.aac", // ind 1; Radio Top (Ostschweiz)
    "http://stream.srg-ssr.ch/m/rsc_de/mp3_128", // ind 2; Radio Swiss Classic
    "https://radiorlouange.ice.infomaniak.ch/radiorlouange-96.aac", // ind 3; Radio R Louange
    "http://stream.srg-ssr.ch/m/rsp/mp3_128", // ind 4; Radio Swiss Pop
    "https://live.streams.klassikradio.de/klassikradio-deutschland/stream/mp3" // ind 5; Klassik Radio
};
// clang-format on

ICYStream      urlStream(WIFI_SSID, WIFI_PW);
MetaDataOutput metaDataOut;
MultiOutput    multiOut;
MultiDecoder   multiDecoder;

BufferRTOS<uint8_t>  audioBuffer(2048 * 10); // Perfekte Größe für 10 Frames
QueueStream<uint8_t> audioQueue(audioBuffer);

command_t command;
command_t genCmd;
int8_t    genUrlIndex = 0;

static QueueHandle_t commandQueue;

MP3DecoderHelix    mp3;
AACDecoderHelix    aac;
I2SStream          i2s;                               // final output of decoded stream
EncodedAudioStream decodeStream(&i2s, &multiDecoder); // Decoding stream

// copy
StreamCopy copierSource(audioQueue, urlStream);
StreamCopy copierSink(multiOut, audioQueue);

// Print Audio Metadata
void printMetaData(MetaDataType type, const char* str, int len) {
    Serial.print("==> ");
    Serial.print(toStr(type));
    Serial.print(": ");
    Serial.println(str);
}

//------------------------------------------------------------
// Tasks
//------------------------------------------------------------
void inputTask(void* parameters) {
    log_i("inputTask started");
    while (true) {
        copierSource.copy();

        if (xQueueReceive(commandQueue, (void*)&command, 0) == pdTRUE) {
            switch (command.command) {
                case NEXT:
                    log_i("--> Next: ind %d", command.value);
                    urlStream.end();
                    urlStream.begin(urls[command.value]);
                    log_i("Next: %s", urls[command.value]);
                    break;
                default: log_i("Unknown serielCommand"); break;
            }
        }
        vTaskDelay(25 / portTICK_PERIOD_MS); // Klassik Radio, mit diesem Delay noch perfekter Sound
    }
}

void outputTask(void* parameters) {
    log_i("outputTask started");
    while (true) {
        //
        copierSink.copy();
        vTaskDelay(30 / portTICK_PERIOD_MS); // Klassik Radio, mit diesem Delay noch perfekter Sound
    }
}

/*
Generates a command every 10 seconds
*/
void commandGeneratorTask(void* parameters) {
    log_i("CmdGen Task started");

    while (true) {
        genUrlIndex = (genUrlIndex + 1) % (sizeof(urls) / sizeof(urls[0]));
        genCmd = {COMMAND::NEXT, genUrlIndex};
        xQueueSend(commandQueue, (void*)&genCmd, 10);

        vTaskDelay(10000 / portTICK_PERIOD_MS);
    }
}

//------------------------------------------------------------
// Setup
//------------------------------------------------------------
void setup() {
    Serial.begin(115200);
    AudioLogger::instance().begin(Serial, AudioLogger::Warning);

    commandQueue = xQueueCreate(2, sizeof(command_t));

    multiDecoder.addDecoder(mp3, "audio/mpeg");
    multiDecoder.addDecoder(aac, "audio/aac");

    // start Queue
    audioQueue.begin();

    // start I2S
    log_i("starting I2S...");
    auto config = i2s.defaultConfig(TX_MODE);
    config.pin_bck = 4;
    config.pin_ws = 6;
    config.pin_data = 5;
    i2s.begin(config);

    multiOut.add(metaDataOut);
    multiOut.add(decodeStream);
    multiOut.begin();

    // mp3 radio
    urlStream.setMetadataCallback(printMetaData);
    urlStream.begin(urls[genUrlIndex]);

    // setup metadata
    metaDataOut.begin(urlStream.httpRequest());
    decodeStream.begin();

    xTaskCreatePinnedToCore( // Use xTaskCreate() in vanilla FreeRTOS
        inputTask,           // Function to be called
        "Input",             // Name of task
        10000,               // Stack size (bytes in ESP32, words in FreeRTOS)
        NULL,                // Parameter to pass
        3,                   // Task priority
        NULL,                // Task handle
        1);                  // Run on one core for demo purposes (ESP32 only)

    xTaskCreatePinnedToCore( // Use xTaskCreate() in vanilla FreeRTOS
        outputTask,          // Function to be called
        "Output",            // Name of task
        4096,                // Stack size (bytes in ESP32, words in FreeRTOS)
        NULL,                // Parameter to pass
        4,                   // Task priority
        NULL,                // Task handle
        0);                  // Run on one core for demo purposes (ESP32 only)

    xTaskCreatePinnedToCore(  // Use xTaskCreate() in vanilla FreeRTOS
        commandGeneratorTask, // Function to be called
        "Gen",                // Name of task
        2048,                 // Stack size (bytes in ESP32, words in FreeRTOS)
        NULL,                 // Parameter to pass
        10,                   // Task priority
        NULL,                 // Task handle
        1);                   // Run on one core for demo purposes (ESP32 only)

    // Delete "setup and loop" task
    vTaskDelete(NULL);
}

void loop() {}

[pschatzmann]

I think you are missing the logic to close and reopen the EncodedAudioStream when you change the url.
Just use the log level Info to figure out what is going on...

[pschatzmann]

OK: I needed to double check the documentation: the method name is selectDecoder(mime)

[eismeraldo]

Unfortunately the compiler now throws a lot of errors, LOGI, LOGD, LOGE... is no longer defined.

[pschatzmann]

I could reproduce your issue: the correction has been committed!

[pschatzmann]

ps: I added some new DRAFT method setMimeSource(urlStream) so that the system can determine the mime type from the http content-type header.

I did not have the time to test this yet....

[eismeraldo]

The correct decoder is now found. The streams are played correctly. The AAC decoder still has problems. The test program has three AAC streams and three MP3 streams. The URLs are iterated through. Two runs are the maximum. Usually only two aac URLs are played and the third one freezes the program without crashing.
Excerpt from the LOG:

[I] Url.h : 96 - url->http://stream.srg-ssr.ch/m/regi_zh_sh/mp3_128
[I] Url.h : 97 - host->stream.srg-ssr.ch
[I] Url.h : 98 - protocol->http
[I] Url.h : 99 - path->/m/regi_zh_sh/mp3_128
[I] Url.h : 100 - port->80
[I] HttpRequest.h : 240 - process connecting to host stream.srg-ssr.ch port 80
[135656][D][NetworkManager.cpp:127] hostByName(): DNS found IPv4 193.218.103.246
[I] HttpRequest.h : 367 - is connected true  with timeout 60000
[I] HttpRequest.h : 251 - Free heap: 237012
[I] HttpHeader.h : 269 - HttpHeader::write
[I] HttpHeader.h : 424 - -> GET /m/regi_zh_sh/mp3_128 HTTP/1.1
[I] HttpHeader.h : 203 -  -> Icy-MetaData: 1 
[I] HttpHeader.h : 203 -  -> Host: stream.srg-ssr.ch 
[I] HttpHeader.h : 203 -  -> Connection: keep-alive 
[I] HttpHeader.h : 203 -  -> Accept-Encoding: identity 
[I] HttpHeader.h : 203 -  -> Accept: audio/mpeg 
[I] HttpHeader.h : 345 -  -> <CR LF> 
[I] MP3HeaderParser.h : 223 - checking header at 219
[I] HttpRequest.h : 316 - Request written ... waiting for reply
[I] MP3HeaderParser.h : 359 - - sample rate: 0
[I] MP3HeaderParser.h : 360 - 

or

[I] Url.h : 96 - url->http://mp3channels.webradio.antenne.de/90er-hits.aac
[I] Url.h : 97 - host->mp3channels.webradio.antenne.de
[I] Url.h : 98 - protocol->http
[I] Url.h : 99 - path->/90er-hits.aac
[I] Url.h : 100 - port->80
[I] MP3HeaderParser.h : 359 - - sample rate: 22050
[I] MP3HeaderParser.h : 360 - - bit rate: 192000
[I] HttpRequest.h : 240 - process connecting to host mp3channels.webradio.antenne.de port 80
[I] MP3HeaderParser.h : 417 - invalid Emphasis
[I] MP3HeaderParser.h : 223 - checking header at 50
[I] MP3HeaderParser.h : 359 - - sample rate: 0
[I] MP3HeaderParser.h : 360 - [ 30669][D][NetworkManager.cpp:127] hostByName(): DNS found IPv4 194.97.151.138

or

[I] Url.h : 96 - url->http://liveradio.swr.de/sw890cl/swr4fn/play.aac
[I] Url.h : 97 - host->liveradio.swr.de
[I] Url.h : 98 - protocol->http
[I] Url.h : 99 - path->/sw890cl/swr4fn/play.aac
[I] Url.h : 100 - port->80
[I] MP3HeaderParser.h : 359 - - sample rate: 24000
[I] MP3HeaderParser.h : 360 - - bit rate: 128000
[I] HttpRequest.h : 240 - process connecting to host liveradio.swr.de port 80
[I] MP3HeaderParser.h : 417 - invalid Emphasis
[I] MP3HeaderParser.h : 223 - checking header at 520
[I] MP3HeaderParser.h : 359 - - sample rate: 24000
[I] MP3HeaderParser.h : 360 - - bit rate: 128000
[ 15768][D][NetworkManager.cpp:127] hostByName(): DNS found IPv4 34.149.96.185
[I] MP3HeaderParser.h : 417 - invalid Emphasis
[I] MP3HeaderParser.h : 223 - checking header at 844
[I] MP3HeaderParser.h : 359 - - sample rate: 0
[I] MP3HeaderParser.h : 360 - 

I tried it with different aac URLs. For most of them the metadata is output, but no sound. A lot of aac streams are aacp / aac+. The aacp cannot be decoded with the AACDecoderHelix. Is there a decoder for aacp in the arduino-libhelix?
At the moment I'm limiting myself to mp3.

Thank you very much for the help and the well-structured libraries.