Memory error when using Filter

Author: pschatzmann

examples/.DS_Store

@@ -18,9 +18,9 @@ namespace audio_tools {
  */
 class AudioPrint : public Print {
     public:
-        virtual size_t write(const uint8_t *buffer, size_t size) = 0;
+        virtual size_t write(const uint8_t *buffer, size_t size) override = 0;
 
-        virtual size_t write(uint8_t ch) {
+        virtual size_t write(uint8_t ch) override {
             tmp[tmpPos++] = ch;
             if (tmpPos>MAX_SINGLE_CHARS){
                 flush();
@@ -222,6 +222,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
          */
         EncodedAudioStream(Print &outputStream, AudioDecoder &decoder) {
             LOGD(LOG_METHOD);
+            ptr_out = &outputStream;
             decoder_ptr = &decoder;
             decoder_ptr->setOutputStream(outputStream);
             writer_ptr = decoder_ptr;
@@ -237,6 +238,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
          */
         EncodedAudioStream(Print *outputStream, AudioDecoder *decoder) {
             LOGD(LOG_METHOD);
+            ptr_out = outputStream;
             decoder_ptr = decoder;
             decoder_ptr->setOutputStream(*outputStream);
             writer_ptr = decoder_ptr;
@@ -251,6 +253,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
          */
         EncodedAudioStream(Print &outputStream, AudioEncoder &encoder) {
             LOGD(LOG_METHOD);
+            ptr_out = &outputStream;
             encoder_ptr = &encoder;
             encoder_ptr->setOutputStream(outputStream);
             writer_ptr = encoder_ptr;
@@ -265,6 +268,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
          */
         EncodedAudioStream(Print *outputStream, AudioEncoder *encoder) {
             LOGD(LOG_METHOD);
+            ptr_out = outputStream;
             encoder_ptr = encoder;
             encoder_ptr->setOutputStream(*outputStream);
             writer_ptr = encoder_ptr;
@@ -276,7 +280,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
          * 
          */
         EncodedAudioStream(){
-             LOGD(LOG_METHOD);
+            LOGD(LOG_METHOD);
             active = false;
         }
 
@@ -291,15 +295,16 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
         }
 
         /// Define object which need to be notified if the basinfo is changing
-        void setNotifyAudioChange(AudioBaseInfoDependent &bi) {
+        void setNotifyAudioChange(AudioBaseInfoDependent &bi) override {
              LOGD(LOG_METHOD);
             decoder_ptr->setNotifyAudioChange(bi);
         }
 
 
         /// Starts the processing - sets the status to active
         void begin(Print *outputStream, AudioEncoder *encoder) {
-             LOGD(LOG_METHOD);
+            LOGD(LOG_METHOD);
+            ptr_out = outputStream;
             encoder_ptr = encoder;
             encoder_ptr->setOutputStream(*outputStream);
             writer_ptr = encoder_ptr;
@@ -309,6 +314,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
         /// Starts the processing - sets the status to active
         void begin(Print *outputStream, AudioDecoder *decoder) {
              LOGD(LOG_METHOD);
+            ptr_out = outputStream;
             decoder_ptr = decoder;
             decoder_ptr->setOutputStream(*outputStream);
             writer_ptr = decoder_ptr;
@@ -350,7 +356,7 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
         }
 
         /// encode the data
-        virtual size_t write(const uint8_t *data, size_t len){
+        virtual size_t write(const uint8_t *data, size_t len) override {
             LOGD("%s: %zu", LOG_METHOD, len);
             if(len==0) {
                 return 0;
@@ -366,6 +372,10 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
             CHECK_MEMORY();
             return result;
         }
+
+        int availableForWrite() override {
+            return ptr_out->availableForWrite();
+        }
 
 
         /// Returns true if status is active and we still have data to be processed
@@ -388,8 +398,8 @@ class EncodedAudioStream : public AudioPrint, public AudioBaseInfoSource {
         AudioDecoder *decoder_ptr = CodecNOP::instance();  // decoder
         AudioEncoder *encoder_ptr = CodecNOP::instance();  // decoder
         AudioWriter *writer_ptr = nullptr ;
+        Print *ptr_out=nullptr;
 
-        Stream *input_ptr; // data source for encoded data
         uint8_t *write_buffer = nullptr;
         int write_buffer_pos = 0;
         const int write_buffer_size = 256;

src/AudioTools/AudioOutput.h

@@ -605,7 +605,7 @@ class FilteredStream : public AudioStreamX {
         }
 
         size_t readBytes(uint8_t *data, size_t length) override {
-           size_t result; p_stream->readBytes(data, length);
+           size_t result = p_stream->readBytes(data, length);
            p_converter->convert(data, result); 
            return result;
         }

src/AudioTools/AudioStreams.h

@@ -58,7 +58,7 @@ class AudioBaseInfoDependent {
  */
 class AudioBaseInfoSource {
     public:
-      virtual void setNotifyAudioChange(AudioBaseInfoDependent &bi) = 0;
+      virtual void  setNotifyAudioChange(AudioBaseInfoDependent &bi) = 0;
 };
 
 

src/AudioTools/AudioTypes.h

@@ -5,7 +5,21 @@
 #include "SdFat.h"
 
 // define FIR filter
-float coef[] = { 0.021, 0.096, 0.146, 0.096, 0.021};
+float coef[] = { 
+-0.018296746249137946,
+-0.056723974384224739,
+0.018540799820324621,
+0.097644454515593698,
+-0.018688161556077588,
+-0.297627121039396536,
+0.550301497785836702,
+-0.297627121039396536,
+-0.018688161556077588,
+0.097644454515593698,
+0.018540799820324621,
+-0.056723974384224739,
+-0.018296746249137946
+};
 // 
 uint16_t sample_rate=44100;
 uint8_t channels = 2;                                             // The stream will have 2 channels 
@@ -15,7 +29,7 @@ FilteredStream<int16_t, float> in_filtered(in_stream, channels);  // Defiles the
 SdFat sd;
 SdFile file;
 EncodedAudioStream out(&file, new WAVEncoder());                  // encode as wav file
-StreamCopy copier(out, in_stream);                                // copies sound to out
+StreamCopy copier(out, in_filtered);                                // copies sound to out
 
 void setup(){
   Serial.begin(115200);