RAWDecoder and RAWEncoder

Author: pschatzmann

examples/examples-stream/streams-i2s-filter-i2s/streams-i2s-filter-i2s.ino

@@ -13,9 +13,8 @@ I2SStream in;
 I2SStream out; 
 
 // copy filtered values
-ConverterNChannels<int16_t> converter(channels);  // Defiles the filter as BaseConverter
-FilteredStream<int16_t, float> inFiltered(in);    // 
-StreamCopy copier(out, inFiltered);               // copies sound into i2s
+FilteredStream<int16_t, float> filtered(in, channels);  // Defiles the filter as BaseConverter
+StreamCopy copier(out, filtered);               // copies sound into i2s
 
 // define FIR filter parameters
 float coef[] = { 0.021, 0.096, 0.146, 0.096, 0.021};
@@ -29,8 +28,8 @@ void setup(void) {
   AudioLogger::instance().begin(Serial, AudioLogger::Info); 
 
   // setup filters for all available channels
-  inFiltered.setFilter(0, new FIR<float>(coef));
-  inFiltered.setFilter(1, new FIR<float>(coef));
+  filtered.setFilter(0, new FIR<float>(coef));
+  filtered.setFilter(1, new FIR<float>(coef));
 
   // start I2S in
   Serial.println("starting I2S...");

src/AudioCodecs/AudioCodecs.h

@@ -2,6 +2,7 @@
 
 #include "AudioCodecs/CodecWAV.h"
 #include "AudioCodecs/CodecNOP.h"
+#include "AudioCodecs/CodecRAW.h"
 
 #if defined(USE_HELIX) || defined(USE_DECODERS)
 #include "AudioCodecs/CodecHelix.h"

src/AudioCodecs/CodecMP3MAD.h

@@ -47,7 +47,7 @@ class MP3DecoderMAD : public AudioDecoder  {
         }
 
         /// Defines the callback which receives the decoded data
-        void setDataCallback(libmad::MP3DataCallback cb){
+        void setAudioDataCallback(libmad::MP3DataCallback cb){
             LOGD(LOG_METHOD);
             mad->setDataCallback(cb);
         }

src/AudioCodecs/CodecRAW.h

@@ -0,0 +1,166 @@
+#pragma once
+
+#include "AudioTools/AudioTypes.h"
+
+namespace audio_tools {
+
+const char* raw_mime = "audio/pcm";
+
+/**
+ * @brief RAWDecoder - Actually this class does no encoding or decoding at all. It just passes on the 
+ * data. The reason that this class exists is that we can use the same processing chain for different
+ * file types and just replace the decoder.
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+class RAWDecoder : public AudioDecoder {
+    public:
+        /**
+         * @brief Construct a new RAWDecoder object
+         */
+
+        RAWDecoder(){
+            LOGD(LOG_METHOD);
+        }
+
+        /**
+         * @brief Construct a new RAWDecoder object
+         * 
+         * @param out_stream Output Stream to which we write the decoded result
+         */
+        RAWDecoder(Print &out_stream, bool active=true){
+            LOGD(LOG_METHOD);
+            p_print = &out_stream;
+            this->active = active;
+        }
+
+        /**
+         * @brief Construct a new RAWDecoder object
+         * 
+         * @param out_stream Output Stream to which we write the decoded result
+         * @param bi Object that will be notified about the Audio Formt (Changes)
+         */
+
+        RAWDecoder(Print &out_stream, AudioBaseInfoDependent &bi){
+            LOGD(LOG_METHOD);
+            p_print = &out_stream;
+        }
+
+        /// Defines the output Stream
+        void setOutputStream(Print &out_stream) override {
+            p_print = &out_stream;
+        }
+
+        void setNotifyAudioChange(AudioBaseInfoDependent &bi) override {
+            this->bid = &bi;
+        }
+
+        AudioBaseInfo audioInfo() override {
+            return cfg;
+        }
+
+        void begin(AudioBaseInfo info) {
+            LOGD(LOG_METHOD);
+            cfg = info;
+            if (bid!=nullptr){
+                bid->setAudioInfo(cfg);
+            }
+            active = true;
+        }
+
+        void begin() override {
+            LOGD(LOG_METHOD);
+            active = true;
+        }
+
+        void end() override {
+            LOGD(LOG_METHOD);
+            active = false;
+        }
+
+        virtual size_t write(const void *in_ptr, size_t in_size) override {
+            if (p_print!=nullptr)  return 0;
+            return p_print->write((uint8_t*)in_ptr, in_size);
+        }
+
+        virtual operator boolean() override {
+            return active;
+        }
+
+    protected:
+        Print *p_print=nullptr;
+        AudioBaseInfoDependent *bid=nullptr;
+        AudioBaseInfo cfg;
+        bool active;
+
+};
+
+/**
+ * @brief RAWDecoder - Actually this class does no encoding or decoding at all. It just passes on the 
+ * data. 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+class RAWEncoder : public AudioEncoder {
+    public: 
+        // Empty Constructor - the output stream must be provided with begin()
+        RAWEncoder(){
+        }        
+
+        // Constructor providing the output stream
+        RAWEncoder(Print &out){
+            p_print = &out;
+        }
+
+        /// Defines the output Stream
+        void setOutputStream(Print &out_stream) override {
+            p_print = &out_stream;
+        }
+
+        /// Provides "audio/pcm"
+        const char* mime() override{
+            return raw_mime;
+        }
+
+        /// We actually do nothing with this 
+        virtual void setAudioInfo(AudioBaseInfo from) override {
+        }
+
+        /// starts the processing using the actual RAWAudioInfo
+        virtual void begin() override{
+            is_open = true;
+        }
+
+        /// starts the processing
+        void begin(Print &out) {
+            p_print = &out;
+            begin();
+        }
+
+        /// stops the processing
+        void end() override {
+            is_open = false;
+        }
+
+        /// Writes PCM data to be encoded as RAW
+        virtual size_t write(const void *in_ptr, size_t in_size) override {
+            if (p_print!=nullptr)  return 0;
+            return p_print->write((uint8_t*)in_ptr, in_size);
+        }
+
+        operator boolean() override {
+            return is_open;
+        }
+
+        bool isOpen(){
+            return is_open;
+        }
+
+    protected:
+        Print* p_print=nullptr;;
+        volatile bool is_open;
+
+};
+
+}

src/AudioMetaData/MetaDataICY.h

@@ -41,8 +41,8 @@ class MetaDataICY : public AbstractMetaData {
             callback = fn;
         }
 
-        /// Defines the metadata callback function
-        virtual void setDataCallback(void (*fn)(const uint8_t* str, int len), int bufferLen=1024)  {
+        /// Defines the audio callback function
+        virtual void setAudioDataCallback(void (*fn)(const uint8_t* str, int len), int bufferLen=1024)  {
             dataBuffer = new uint8_t[bufferLen];
             dataCallback = fn;
             dataLen = 0;

src/AudioTools/AudioStreams.h

@@ -52,16 +52,16 @@ class AudioStream : public Stream, public AudioBaseInfoDependent {
  */
 class AudioStreamX : public AudioStream {
  public:
-  virtual size_t readBytes(uint8_t *buffer, size_t length) { return not_supported(0); }
-  virtual size_t write(const uint8_t *buffer, size_t size) { return not_supported(0); }
-  virtual size_t write(uint8_t) { return not_supported(0); }
-  virtual int available() { return not_supported(0); };
+  virtual size_t readBytes(uint8_t *buffer, size_t length) override { return not_supported(0); }
+  virtual size_t write(const uint8_t *buffer, size_t size) override{ return not_supported(0); }
+  virtual size_t write(uint8_t) override { return not_supported(0); }
+  virtual int available() override { return not_supported(0); };
   virtual int availableForWrite() override { return DEFAULT_BUFFER_SIZE; }
 
-  virtual int read() { return not_supported(-1); }
-  virtual int peek() { return not_supported(-1); }
-  virtual void flush() {}
-  virtual void setAudioInfo(audio_tools::AudioBaseInfo){}
+  virtual int read() override { return not_supported(-1); }
+  virtual int peek() override { return not_supported(-1); }
+  virtual void flush() override {}
+  virtual void setAudioInfo(audio_tools::AudioBaseInfo) override {}
 };
 
 /**

src/AudioTools/AudioTypes.h

@@ -69,7 +69,7 @@ class AudioBaseInfoSource {
  */
 class AudioWriter {
   public: 
-        virtual size_t write(const void *in_ptr, size_t in_size) = 0;
+      virtual size_t write(const void *in_ptr, size_t in_size) = 0;
       virtual operator boolean() = 0;
 };
 

tests/build-examples-log.txt

@@ -1,4 +1,3 @@
-
 ../examples/examples-basic-api/base-adc-a2dp -> rc=0
 ../examples/examples-basic-api/base-adc-serial -> rc=0
 ../examples/examples-basic-api/base-file_mp3-a2dp -> rc=0
@@ -54,6 +53,7 @@
 ../examples/examples-audiokit/player-url_icy-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-csv -> rc=0
+../examples/examples-audiokit/streams-audiokit-filter-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-webserver_aac -> rc=0
 ../examples/examples-audiokit/streams-audiokit-webserver_wav -> rc=0
 ../examples/examples-audiokit/streams-flite-audiokit -> rc=0

tests/mp3-mad/CMakeLists.txt

@@ -22,8 +22,10 @@ endif()
 # build sketch as executable
 add_executable (mp3-mad mp3-mad.cpp ../main.cpp)
 # set preprocessor defines
-target_compile_definitions(mp3-mad PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_MAD -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(mp3-mad PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_MAD -DUSE_PORTAUDIO -DIS_DESKTOP )
 
 # specify libraries
-target_link_libraries(mp3-mad portaudio arduino_emulator arduino_libmad arduino-audio-tools)
+target_link_libraries(mp3-mad portaudio arduino_emulator arduino_libmad arduino-audio-tools )
+# ESP32: CONFIG_ARDUINO_LOOP_STACK_SIZE 8192 -> so we test it with this setting "-Wl,-z,stack-size=8192"
+add_link_options("-z,stack-size=8192")