EncodedAudioInfo channel change

Author: pschatzmann

src/AudioTools/AudioCodecs/AudioEncoded.h

@@ -94,8 +94,6 @@ class EncodedAudioOutput : public ModifyingOutput {
     }
   }
 
-  void setOutput(Print &outputStream) override { setOutput(&outputStream); }
-
   /// Defines the output
   void setOutput(Print *outputStream) {
     ptr_out = outputStream;
@@ -107,6 +105,20 @@ class EncodedAudioOutput : public ModifyingOutput {
     }
   }
 
+  void setOutput(AudioStream* out) { 
+    setOutput((Print*)out); 
+    to_notify = out;
+  }
+
+  void setOutput(AudioOutput*out){
+    setOutput((Print*)out);
+    to_notify = out;
+  }
+
+  void setOutput(Print &outputStream) override { setOutput(&outputStream); }
+  void setOutput(AudioOutput &outputStream) { setOutput(&outputStream); }
+  void setOutput(AudioStream &outputStream) { setOutput(&outputStream); }
+
   void setEncoder(AudioEncoder *encoder) {
     if (encoder == nullptr) {
       encoder = CodecNOP::instance();
@@ -138,8 +150,12 @@ class EncodedAudioOutput : public ModifyingOutput {
     TRACED();
     if (!active) {
       TRACED();
-      const CodecNOP *nop = CodecNOP::instance();
-      if (decoder_ptr != nop || encoder_ptr != nop) {
+      // Setup notification
+      if (to_notify != nullptr) {
+        decoder_ptr->removeNotifyAudioChange(*to_notify);
+        decoder_ptr->addNotifyAudioChange(*to_notify);
+      } 
+      if (decoder_ptr != undefined || encoder_ptr != undefined) {
         active = true;
         if (!decoder_ptr->begin(cfg)) active = false;
         if (!encoder_ptr->begin(cfg)) active = false;
@@ -220,12 +236,22 @@ class EncodedAudioOutput : public ModifyingOutput {
     return *this;
   }
 
+  /// Provide audio info from decoder if relevant
+  AudioInfo audioInfo() override {
+    if (decoder_ptr != undefined){
+      return decoder_ptr->audioInfo();
+    } 
+    return ModifyingOutput::audioInfo(); 
+  }
+
  protected:
   // AudioInfo info;
-  AudioDecoder *decoder_ptr = CodecNOP::instance();  // decoder
-  AudioEncoder *encoder_ptr = CodecNOP::instance();  // decoder
+  CodecNOP* undefined = CodecNOP::instance();
+  AudioDecoder *decoder_ptr = undefined;  // decoder
+  AudioEncoder *encoder_ptr = undefined;  // decoder
   AudioWriter *writer_ptr = nullptr;
   Print *ptr_out = nullptr;
+  AudioInfoSupport *to_notify = nullptr;
   bool active = false;
   bool check_available_for_write = false;
   int frame_size = DEFAULT_BUFFER_SIZE;
@@ -371,6 +397,8 @@ class EncodedAudioStream : public ReformatBaseStream {
     return *this;
   };
 
+  AudioInfo audioInfo() override { return enc_out.audioInfo(); }
+
  protected:
   EncodedAudioOutput enc_out;
   float byte_factor = 2.0f;

src/AudioTools/CoreAudio/AudioStreamsConverter.h

@@ -130,23 +130,8 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
 
   void setAudioInfo(AudioInfo cfg) override {
     TRACED();
-    from_channels = cfg.channels;
-    LOGI("--> ChannelFormatConverterStream");
-    AudioStream::setAudioInfo(cfg);
-    switch (bits_per_sample) {
-      case 8:
-        getConverter<int8_t>()->setAudioInfo(cfg);
-        break;
-      case 16:
-        getConverter<int16_t>()->setAudioInfo(cfg);
-        break;
-      case 24:
-        getConverter<int24_t>()->setAudioInfo(cfg);
-        break;
-      case 32:
-        getConverter<int32_t>()->setAudioInfo(cfg);
-        break;
-    }
+    end();
+    begin(cfg, to_channels);
   }
 
   /// Returns the AudioInfo with the to_channels
@@ -169,24 +154,31 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
   }
 
   bool begin(AudioInfo cfg, int toChannels) {
-    assert(toChannels != 0);
+    // assert(toChannels != 0);
+    if (toChannels == 0) {
+      LOGE("toChannels is 0");
+      return false;
+    }
     // is_output_notify = false;
     to_channels = toChannels;
     from_channels = cfg.channels;
     bits_per_sample = cfg.bits_per_sample;
     LOGI("--> ChannelFormatConverterStream");
     AudioStream::setAudioInfo(cfg);
     LOGI("begin %d -> %d channels", cfg.channels, toChannels);
-    bool result = setupConverter(cfg.channels, toChannels);
-    if (!result) {
+    is_active = setupConverter(cfg.channels, toChannels);
+    if (!is_active) {
       TRACEE()
     }
-    return result;
+    return is_active;
   }
 
   bool begin() override { return begin(audioInfo(), to_channels); }
 
-  void end() override { cleanupConverter(); }
+  void end() override { 
+    cleanupConverter(); 
+    is_active = false;
+  }
 
   void setToChannels(uint16_t channels) { to_channels = channels; }
 
@@ -261,8 +253,9 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
  protected:
   void *converter = nullptr;
   int bits_per_sample = 0;
-  int to_channels;
-  int from_channels;
+  int to_channels = 0;
+  int from_channels = 0;
+  bool is_active = false;
 
   template <typename T>
   ChannelFormatConverterStreamT<T> *getConverter() {
@@ -782,6 +775,7 @@ class FormatConverterStream : public ReformatBaseStream {
   /// Set the input audio information
   void setAudioInfo(AudioInfo info) override {
     TRACEI();
+    info.logInfo("FormatConverterStream");
     ReformatBaseStream::setAudioInfo(info);
     // ChannelFormatConverter -> NumberFormatConverter -> SampleRateCoverter
     channelFormatConverter.setAudioInfo(info);

src/AudioTools/CoreAudio/BaseConverter.h

@@ -1294,6 +1294,7 @@ class ChannelEnhancer {
   }
 
   size_t convert(uint8_t *target, uint8_t *src, size_t size) {
+    if (from_channels == 0) return size;
     int frame_count = size / (sizeof(T) * from_channels);
     size_t result_size = 0;
     T *result = (T *)target;
@@ -1321,8 +1322,8 @@ class ChannelEnhancer {
   }
 
  protected:
-  int from_channels;
-  int to_channels;
+  int from_channels = 0;
+  int to_channels = 0;
 };
 
 /**