M4a (#2063)

* InputMixer

* MP4: fix alac

* Fix esds parsing with ESDSParser

* ContainerM4A fix broken output

* Deactivate stco

* M4A alac support

Author: pschatzmann

src/AudioTools/AudioCodecs/CodecALAC.h

@@ -42,7 +42,7 @@ class DecoderALAC : public AudioDecoder {
   DecoderALAC(int frameSize = kALACDefaultFrameSize) {
     // this is used when setCodecConfig() is not called with encoder info
     setFrameSize(frameSize);
-    setDefaultConfig();
+    //setDefaultConfig();
   }
 
   // define ALACSpecificConfig
@@ -86,14 +86,13 @@ class DecoderALAC : public AudioDecoder {
     dec.mConfig.bitDepth = from.bits_per_sample;
   }
 
+
   /// we expect the write is called for a complete frame!
   size_t write(const uint8_t* encodedFrame, size_t encodedLen) override {
     LOGD("DecoderALAC::write: %d", (int)encodedLen);
-    // Safety check
-    if (!is_init) {
-      LOGE("Decoder not initialized");
-      return 0;
-    }
+    // Make sure we have a config: we can't do this in begin because the setConfig()
+    // might be called after begin()
+    if (!is_init) setDefaultConfig();
 
     // Make sure we have the output buffer set up
     if (result_buffer.size() != outputBufferSize()) {

src/AudioTools/AudioCodecs/CodecCopy.h

@@ -36,6 +36,10 @@ class CopyDecoder : public AudioDecoder {
 
   size_t write(const uint8_t *data, size_t len) { 
     TRACED();
+    if (pt_print == nullptr) {
+      LOGE("No output stream defined for CopyDecoder");
+      return 0;
+    }
     return pt_print->write((uint8_t*)data,len);
   }
 

src/AudioTools/AudioCodecs/ContainerM4A.h

@@ -37,7 +37,7 @@ class ContainerM4A : public ContainerDecoder {
    * @brief Set the output stream for decoded or raw audio.
    * @param out_stream Output AudioStream.
    */
-  void setOutput(AudioStream& out_stream) override {
+  void setOutput(Print& out_stream) override {
     if (p_decoder != nullptr) p_decoder->setOutput(out_stream);
     ContainerDecoder::setOutput(out_stream);
   }
@@ -118,7 +118,9 @@ class ContainerM4A : public ContainerDecoder {
         !self->is_magic_cookie_processed) {
       auto& magic_cookie = self->demux.getALACMagicCookie();
       if (magic_cookie.size() > 0) {
-        dec.setCodecConfig(magic_cookie.data(), magic_cookie.size());
+        if (!dec.setCodecConfig(magic_cookie.data(), magic_cookie.size())){
+          LOGE("Failed to set ALAC magic cookie for decoder: %s", dec.selectedMime());
+        }
       }
       self->is_magic_cookie_processed = true;
     }