Merge branch 'main' of https://github.com/pschatzmann/arduino-audio-tools

Author: pschatzmann

src/AudioTools/AudioCodecs/AudioCodecsBase.h

@@ -59,6 +59,10 @@ class AudioDecoder : public AudioWriter, public AudioInfoSource {
   /// custom id to be used by application
   int id;
 
+  Print* getOutput(){
+    return p_print;
+  }
+
  protected:
   Print *p_print = nullptr;
   AudioInfo info;

src/AudioTools/AudioCodecs/MultiDecoder.h

@@ -40,9 +40,17 @@ class MultiDecoder : public AudioDecoder {
   /// Adds a decoder that will be selected by it's mime type
   void addDecoder(AudioDecoder& decoder, const char* mime) {
     DecoderInfo info{mime, &decoder};
+    decoder.addNotifyAudioChange(*this);
     decoders.push_back(info);
   }
 
+  virtual void setOutput(Print &out_stream) override { 
+    p_print = &out_stream; 
+    for (int j = 0; j < decoders.size(); j++) {
+      decoders[j].decoder->setOutput(out_stream);
+    }
+  }
+ 
   /// selects the actual decoder by mime type - this is usually called
   /// automatically from the determined mime type
   bool selectDecoder(const char* mime) {
@@ -57,16 +65,16 @@ class MultiDecoder : public AudioDecoder {
     // find the corresponding decoder
     for (int j = 0; j < decoders.size(); j++) {
       DecoderInfo info = decoders[j];
-      if (StrView(info.mime).equalsIgnoreCase(mime)) {
-        LOGI("New decoder found for %s", info.mime);
+      if (StrView(info.mime).equals(mime)) {
+        LOGI("New decoder found for %s (%s)", info.mime, mime);
         actual_decoder = info;
-        actual_decoder.decoder->begin();
-        result = true;
-        // define output
-        if (p_print!=nullptr){
-          actual_decoder.decoder->addNotifyAudioChange(*this);
+        // define output if it has not been defined
+        if (p_print!=nullptr 
+        && actual_decoder.decoder->getOutput()==nullptr){
           actual_decoder.decoder->setOutput(*p_print);
         }
+        actual_decoder.decoder->begin();
+        result = true;
       }
     }
     return result;

src/AudioTools/CoreAudio/AudioHttp/HttpHeader.h

@@ -49,12 +49,6 @@ struct HttpHeaderLine {
   HttpHeaderLine(const char* k) { key = k; }
 };
 
-/**
- * @brief workng buffer on the heap
- */
-
-static Vector<char> temp_buffer{0};
-
 /**
  * @brief In a http request and reply we need to process header information.
  * With this API we can define and query the header information. The individual
@@ -302,7 +296,7 @@ class HttpHeader {
   bool isRedirectStatus() { return status_code >= 300 && status_code < 400; }
 
   /// release static temp buffer
-  static void end() { temp_buffer.resize(0); }
+  void end() { temp_buffer.resize(0); }
 
   /// Set the timout
   void setTimeout(int timeoutMs) { timeout_ms = timeoutMs; }
@@ -313,6 +307,11 @@ class HttpHeader {
   /// Defines the protocol: e.g. HTTP/1.1
   void setProtocol(const char* protocal) { protocol_str = protocal; }
 
+  /// Resizes the internal read buffer
+  void resize(int bufferSize){
+    temp_buffer.resize(bufferSize);
+  }
+
  protected:
   int status_code = UNDEFINED;
   bool is_written = false;
@@ -329,9 +328,9 @@ class HttpHeader {
   HttpLineReader reader;
   const char* CRLF = "\r\n";
   int timeout_ms = URL_CLIENT_TIMEOUT;
+  Vector<char> temp_buffer{HTTP_MAX_LEN};
 
   char* tempBuffer() {
-    temp_buffer.resize(HTTP_MAX_LEN);
     temp_buffer.clear();
     return temp_buffer.data();
   }

src/AudioTools/CoreAudio/AudioHttp/HttpRequest.h

@@ -29,7 +29,7 @@ class HttpRequest : public BaseStream {
 
   HttpRequest() = default;
 
-  ~HttpRequest() { HttpHeader::end(); }
+  ~HttpRequest() { end(); }
 
   HttpRequest(Client &client) { setClient(client); }
 

src/AudioTools/CoreAudio/AudioMetaData/MetaDataICY.h

@@ -35,9 +35,7 @@ class MetaDataICY : public AbstractMetaData {
             setIcyMetaInt(metaint);
         }
 
-        ~MetaDataICY(){
-            if (metaData!=nullptr) delete[]metaData;
-        }
+        virtual ~MetaDataICY() {}
 
         /// Defines the ICE metaint value which is provided by the web call!
         virtual void setIcyMetaInt(int value) override {
@@ -139,7 +137,7 @@ class MetaDataICY : public AbstractMetaData {
                     currentStatus = ProcessMetaData;
                     metaData[metaDataPos++]=ch;
                     if (metaDataPos>=metaDataLen){
-                        processMetaData(metaData, metaDataLen);
+                        processMetaData(metaData.data(), metaDataLen);
                         LOGI("Metadata ended")
                         nextStatus = ProcessData;
                     }
@@ -152,7 +150,7 @@ class MetaDataICY : public AbstractMetaData {
         Status nextStatus = ProcessData;
         Status currentStatus = ProcessData;
         void (*callback)(MetaDataType info, const char* str, int len) = nullptr;
-        char* metaData=nullptr;
+        Vector<char> metaData{0};
         int totalData = 0;
         int mp3_blocksize = 0;
         int metaDataMaxLen = 0;
@@ -168,6 +166,7 @@ class MetaDataICY : public AbstractMetaData {
         virtual void clear() {
             nextStatus = ProcessData;
             totalData = 0;
+            metaData.resize(0);
             metaDataLen = 0;
             metaDataPos = 0;
             dataLen = 0;
@@ -192,21 +191,9 @@ class MetaDataICY : public AbstractMetaData {
         /// allocates the memory to store the metadata / we support changing sizes
         virtual void setupMetaData(int meta_size) {
             TRACED();
-            if (meta_size>0){
-                if (metaData==nullptr){
-                    metaData = new char[meta_size+1];
-                    metaDataMaxLen = meta_size;
-                    LOGD("metaDataMaxLen: %d", metaDataMaxLen);
-                } else {
-                    if (meta_size>metaDataMaxLen){
-                        delete [] metaData; 
-                        metaData = new char[meta_size+1];
-                        metaDataMaxLen = meta_size;
-                        LOGD("metaDataMaxLen: %d", metaDataMaxLen);
-                    }
-                }
-                memset(metaData, 0, meta_size);
-            }
+            metaData.resize(meta_size+1);
+            metaDataMaxLen = meta_size;
+            memset(metaData.data(), 0, meta_size+1);
         }
 
         /// e.g. StreamTitle=' House Bulldogs - But your love (Radio Edit)';StreamUrl='';

src/AudioTools/CoreAudio/MimeDetector.h

@@ -64,14 +64,18 @@ class MimeDetector {
       const uint8_t* start = (const uint8_t*)data;
       if (start[0] == 0xFF && start[1] == 0xF1) {
         mime = "audio/aac";
-      } else if (memcmp(start, "ID3", 3)==0 || start[0] == 0xFF || start[0] == 0xFE) {
+      } else if (memcmp(start, "ID3", 3)==0 
+             || start[0] == 0xFF || start[0] == 0xFE) {
         mime = "audio/mpeg";
       } else if (memcmp(start, "RIFF", 4)==0) {
         mime = "audio/vnd.wave";
       } else if (memcmp(start, "OggS", 4)==0) {
         mime = "audio/ogg";
       }
     }
+    if (mime != nullptr) {
+      LOGI("Determined mime: %s", mime);
+    }
     return mime;
   }
 };