new class MultiStreamingDecoder

Author: pschatzmann

src/AudioTools/AudioCodecs/AudioCodecs.h

@@ -24,9 +24,9 @@
 #include "AudioTools/AudioCodecs/CodecL8.h"
 #include "AudioTools/AudioCodecs/CodecFloat.h"
 #include "AudioTools/AudioCodecs/CodecBase64.h"
-#include "AudioTools/AudioCodecs/DecoderFromStreaming.h"
 #include "AudioTools/AudioCodecs/MultiDecoder.h"
 #include "AudioTools/AudioCodecs/CodecMTS.h"
 #include "AudioTools/AudioCodecs/CodecADTS.h"
 #include "AudioTools/AudioCodecs/CodecNetworkFormat.h"
 #include "AudioTools/AudioCodecs/CodecFactory.h"
+#include "AudioTools/AudioCodecs/StreamingDecoder.h"

src/AudioTools/AudioCodecs/AudioCodecsBase.h

@@ -156,116 +156,4 @@ class CodecNOP : public AudioDecoder, public AudioEncoder {
   virtual const char *mime() { return nullptr; }
 };
 
-/**
- * @brief A Streaming Decoder where we provide both the input and output
- * as streams.
- * @ingroup codecs
- * @author Phil Schatzmann
- * @copyright GPLv3
- */
-class StreamingDecoder : public AudioInfoSource {
- public:
-  /// Starts the processing
-  virtual bool begin() = 0;
-
-  /// Releases the reserved memory
-  virtual void end() = 0;
-
-  /// Defines the output Stream
-  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
-
-  /// Defines the output streams and register to be notified
-  virtual void setOutput(AudioStream &out_stream) {
-    Print *p_print = &out_stream;
-    setOutput(*p_print);
-    addNotifyAudioChange(out_stream);
-  }
-
-  /// Defines the output streams and register to be notified
-  virtual void setOutput(AudioOutput &out_stream) {
-    Print *p_print = &out_stream;
-    setOutput(*p_print);
-    addNotifyAudioChange(out_stream);
-  }
-
-  /// Stream Interface: Decode directly by taking data from the stream. This is
-  /// more efficient then feeding the decoder with write: just call copy() in
-  /// the loop
-  void setInput(Stream &inStream) { this->p_input = &inStream; }
-
-  /// Provides the last available MP3FrameInfo
-  virtual AudioInfo audioInfo() = 0;
-
-  /// checks if the class is active
-  virtual operator bool() = 0;
-
-  /// Process a single read operation - to be called in the loop
-  virtual bool copy() = 0;
-
-  /// Process all data
-  bool copyAll() {
-    bool result = false;
-    while (copy()) {
-      result = true;
-    }
-    return result;
-  }
-
- protected:
-  virtual size_t readBytes(uint8_t *data, size_t len) = 0;
-  Print *p_print = nullptr;
-  Stream *p_input = nullptr;
-};
-
-/**
- * @brief Converts any AudioDecoder to a StreamingDecoder
- * @ingroup codecs
- * @author Phil Schatzmann
- * @copyright GPLv3
- */
-class StreamingDecoderAdapter : public StreamingDecoder {
- public:
-  StreamingDecoderAdapter(AudioDecoder &decoder,
-                          int copySize = DEFAULT_BUFFER_SIZE) {
-    p_decoder = &decoder;
-    if (copySize > 0) resize(copySize);
-  }
-  /// Starts the processing
-  bool begin() override { return p_input != nullptr && p_decoder->begin(); }
-
-  /// Releases the reserved memory
-  void end() override { p_decoder->end(); }
-
-  /// Defines the output Stream
-  void setOutput(Print &out_stream) override {
-    p_decoder->setOutput(out_stream);
-  }
-
-  /// Provides the last available MP3FrameInfo
-  AudioInfo audioInfo() override { return p_decoder->audioInfo(); }
-
-  /// checks if the class is active
-  virtual operator bool() override { return *p_decoder; }
-
-  /// Process a single read operation - to be called in the loop
-  virtual bool copy() override {
-    int read = readBytes(&buffer[0], buffer.size());
-    int written = 0;
-    if (read > 0) written = p_decoder->write(&buffer[0], read);
-    return written > 0;
-  }
-
-  /// Adjust the buffer size: the existing content of the buffer is lost!
-  void resize(int bufferSize) { buffer.resize(bufferSize); }
-
- protected:
-  AudioDecoder *p_decoder = nullptr;
-  Vector<uint8_t> buffer{0};
-
-  size_t readBytes(uint8_t *data, size_t len) override {
-    if (p_input == nullptr) return 0;
-    return p_input->readBytes(data, len);
-  }
-};
-
 }  // namespace audio_tools

src/AudioTools/AudioCodecs/CodecFLAC.h

@@ -138,6 +138,13 @@ class FLACDecoder : public StreamingDecoder {
     is_md5_checing = flag;
   }
 
+  /// returns true of the stream is ogg
+  bool isOgg() const { return is_ogg; }
+
+  /// Provides "audio/flac" or "audio/ogg"
+  const char *mime() override { return is_ogg ? "audio/ogg; codecs=flac" : "audio/flac"; }
+
+
  protected:
   bool is_active = false;
   bool is_ogg = false;

src/AudioTools/AudioCodecs/CodecVorbis.h

@@ -118,6 +118,9 @@ class VorbisDecoder : public StreamingDecoder {
     }
   }
 
+  /// Provides "audio/ogg"
+  const char *mime() override { return "audio/vorbis+ogg"; }
+
 protected:
   AudioInfo cfg;
   Vector<uint8_t> pcm;