ContainerM4A: fix core dump

Author: pschatzmann

src/AudioTools/AudioCodecs/ContainerM4A.h

@@ -62,7 +62,11 @@ class ContainerM4A : public ContainerDecoder {
     ContainerM4A* self = static_cast<ContainerM4A*>(ref);
     MultiDecoder& dec = *self->p_decoder;
     // select decoder based on mime type
-    dec.selectDecoder(frame.mime);
+    if (!dec.selectDecoder(frame.mime)){
+      const char*mime = frame.mime ? frame.mime : "(nullptr)";
+      LOGE("No decoder found for mime type: %s", mime);
+      return;
+    }
 
     // process magic cookie if not done yet
     if (!self->is_magic_cookie_processed) {

src/AudioTools/AudioCodecs/M4AAudioDemuxer.h

@@ -18,7 +18,7 @@ class M4AAudioDemuxer {
    */
   struct Frame {
     Codec codec;
-    const char* mime = "";
+    const char* mime = nullptr;;
     const uint8_t* data;
     size_t size;
     uint64_t timestamp;
@@ -45,11 +45,12 @@ class M4AAudioDemuxer {
 
     void setCodec(M4AAudioDemuxer::Codec c) { codec = c; }
 
-    void setCallback(FrameCallback cb, void* r) {
+    void setCallback(FrameCallback cb) {
       callback = cb;
-      ref = r;
     }
 
+    void setReference(void* r) { ref = r; }
+
     void write(const uint8_t* data, size_t len, bool is_final) {
       // Resize buffer to the current sample size
       size_t currentSize = currentSampleSize();
@@ -115,7 +116,7 @@ class M4AAudioDemuxer {
           frame.mime = "audio/mpeg";
           break;
         default:
-          frame.mime = "unknown";
+          frame.mime = nullptr;
           break;
       }
       if (callback) callback(frame, ref);
@@ -152,34 +153,45 @@ class M4AAudioDemuxer {
 
   M4AAudioDemuxer(FrameCallback cb) : callback(cb) {
     parser.setReference(this);
-    // Generic callback which just provides the data in the buffer
     parser.setCallback(boxCallback);
 
+    sampleExtractor.setReference(this);
+    sampleExtractor.setCallback(callback);
+
     // incremental data callback
     parser.setDataCallback(boxDataCallback);
 
     // Add more as needed...
-    parser.begin();
+    // parser.begin();
   }
 
   void begin() {
-    parser.begin();
     codec = Codec::Unknown;
     alacMagicCookie.clear();
+    resize(1024);
 
     // When codec/sampleSizes/callback/ref change, update the extractor:
+    parser.begin();
     sampleExtractor.begin();
-    sampleExtractor.setCallback(callback, ref);
   }
 
   void write(const uint8_t* data, size_t len) { parser.write(data, len); }
 
   int availableForWrite() { return parser.availableForWrite(); }
 
   Vector<uint8_t>& getAlacMagicCookie() { return alacMagicCookie; }
-  void setReference(void* ref) { parser.setReference(ref); }
 
- private:
+  void setReference(void* ref) {
+    this->ref = ref;
+  }
+
+  void resize(int size) {
+    if (buffer.size() < size) {
+      buffer.resize(size);
+    }
+  }
+
+ protected:
   FrameCallback callback;
   MP4ParserIncremental parser;
   Codec codec = Codec::Unknown;
@@ -197,7 +209,7 @@ class M4AAudioDemuxer {
   static void boxCallback(MP4Parser::Box& box, void* ref) {
     M4AAudioDemuxer& self = *static_cast<M4AAudioDemuxer*>(ref);
     if (self.isRelevantBox(box.type)) {
-      self.buffer.resize(box.size);
+      self.resize(box.size);
       self.buffer.clear();
       if (box.data_size > 0) self.buffer.writeArray(box.data, box.data_size);
     }
@@ -348,8 +360,7 @@ class M4AAudioDemuxer {
     size_t size = box.data_size;
     if (size < 4) return;
     uint32_t entryCount = readU32(data);
-    Vector<size_t>& chunkOffsets =
-        sampleExtractor.getChunkOffsets();
+    Vector<size_t>& chunkOffsets = sampleExtractor.getChunkOffsets();
     chunkOffsets.clear();
     if (size < 4 + 4 * entryCount) return;
     for (uint32_t i = 0; i < entryCount; ++i) {

src/AudioTools/AudioCodecs/MultiDecoder.h

@@ -72,7 +72,7 @@ class MultiDecoder : public AudioDecoder {
   /// automatically from the determined mime type
   bool selectDecoder(const char* mime) {
     bool result = false;
-    if (mime = nullptr) return false;
+    if (mime == nullptr) return false;
     // do nothing if no change
     if (StrView(mime).equals(actual_decoder.mime)) {
       is_first = false;

tests-cmake/codec/m4a/CMakeLists.txt renamed to tests-cmake/codec/container-m4a/CMakeLists.txt

@@ -42,6 +42,7 @@ target_compile_options(m4a PRIVATE -Wno-multichar)
 
 # set compile optioins
 target_compile_options(arduino-audio-tools INTERFACE -Wno-inconsistent-missing-override)
+target_compile_definitions(arduino-audio-tools INTERFACE -DUSE_ALLOCATOR)
 
 # specify libraries
 target_link_libraries(m4a PRIVATE