EncodedAudioOutput: call end() only once

Author: pschatzmann

src/AudioTools/AudioCodecs/AudioEncoded.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "AudioCodecsBase.h"
 #include "AudioConfig.h"
 #include "AudioLogger.h"
 #include "AudioTools/CoreAudio/AudioIO.h"
 #include "AudioTools/CoreAudio/AudioOutput.h"
 #include "AudioTools/CoreAudio/AudioStreams.h"
 #include "AudioTools/CoreAudio/AudioTypes.h"
-#include "AudioCodecsBase.h"
 
 namespace audio_tools {
 
@@ -20,9 +20,7 @@ namespace audio_tools {
  */
 class EncodedAudioOutput : public ModifyingOutput {
  public:
-  EncodedAudioOutput() {
-    active = false;
-  }
+  EncodedAudioOutput() { active = false; }
 
   EncodedAudioOutput(AudioDecoder *decoder) {
     setDecoder(decoder);
@@ -88,14 +86,14 @@ class EncodedAudioOutput : public ModifyingOutput {
 
   virtual void setAudioInfo(AudioInfo newInfo) override {
     TRACED();
-    if (this->cfg != newInfo && newInfo.channels != 0 && newInfo.sample_rate != 0) {
+    if (this->cfg != newInfo && newInfo.channels != 0 &&
+        newInfo.sample_rate != 0) {
       this->cfg = newInfo;
       decoder_ptr->setAudioInfo(cfg);
       encoder_ptr->setAudioInfo(cfg);
     }
   }
 
-
   void setOutput(Print &outputStream) { setOutput(&outputStream); }
 
   /// Defines the output
@@ -166,22 +164,24 @@ class EncodedAudioOutput : public ModifyingOutput {
 
   /// Ends the processing
   void end() override {
+    if (active) {
 #if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.set();
+      custom_log_level.set();
 #endif
-    TRACEI();
-    decoder_ptr->end();
-    encoder_ptr->end();
-    active = false;
+      TRACEI();
+      decoder_ptr->end();
+      encoder_ptr->end();
+      active = false;
 #if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.reset();
+      custom_log_level.reset();
 #endif
+    }
   }
 
   /// encoder decode the data
   virtual size_t write(const uint8_t *data, size_t len) override {
     if (len == 0) {
-      //LOGI("write: %d", 0);
+      // LOGI("write: %d", 0);
       return 0;
     }
 #if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
@@ -303,21 +303,13 @@ class EncodedAudioStream : public ReformatBaseStream {
   /// Provides the initialized encoder
   AudioEncoder &encoder() { return *getEncoder(); }
 
-  void setStream(Stream *stream) {
-    setStream(*stream);
-  }
+  void setStream(Stream *stream) { setStream(*stream); }
 
-  void setStream(AudioStream *stream) {
-    setStream(*stream);
-  }
+  void setStream(AudioStream *stream) { setStream(*stream); }
 
-  void setOutput(AudioOutput *stream) {
-    setOutput(*stream);
-  }
+  void setOutput(AudioOutput *stream) { setOutput(*stream); }
 
-  void setOutput(Print *stream) {
-    setOutput(*stream);
-  }
+  void setOutput(Print *stream) { setOutput(*stream); }
 
   void setStream(AudioStream &stream) {
     ReformatBaseStream::setStream(stream);
@@ -350,7 +342,7 @@ class EncodedAudioStream : public ReformatBaseStream {
   }
 
   bool begin() {
-    //is_output_notify = false;
+    // is_output_notify = false;
     setupReader();
     ReformatBaseStream::begin();
     return enc_out.begin(audioInfo());
@@ -364,7 +356,7 @@ class EncodedAudioStream : public ReformatBaseStream {
   int availableForWrite() { return enc_out.availableForWrite(); }
 
   size_t write(const uint8_t *data, size_t len) {
-    //addNotifyOnFirstWrite();
+    // addNotifyOnFirstWrite();
     return enc_out.write(data, len);
   }
 
@@ -376,12 +368,12 @@ class EncodedAudioStream : public ReformatBaseStream {
     enc_out.addNotifyAudioChange(bi);
   }
 
-  /// approx compression factor: e.g. mp3 is around 4 
+  /// approx compression factor: e.g. mp3 is around 4
   float getByteFactor() { return byte_factor; }
-  void setByteFactor(float factor) {byte_factor = factor;}
+  void setByteFactor(float factor) { byte_factor = factor; }
 
 #if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
- /// Defines the class specific custom log level
+  /// Defines the class specific custom log level
   void setLogLevel(AudioLogger::LogLevel level) { enc_out.setLogLevel(level); }
 #endif
 
@@ -391,7 +383,6 @@ class EncodedAudioStream : public ReformatBaseStream {
  protected:
   EncodedAudioOutput enc_out;
   float byte_factor = 2.0f;
-
 };
 
 /**