Rollback AduioESP8266 change

Author: pschatzmann

examples/streams-a2dp-i2s/streams-a2dp-i2s.ino

@@ -1,12 +1,10 @@
-/**
 /**
  * @file streams-a2dp-i2s.ino
  * @author Phil Schatzmann
  * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/streams-a2dp-i2s/README.md
  * 
  * @author Phil Schatzmann
  * @copyright GPLv3
- * 
  */
 #include "AudioTools.h"
 #include "AudioA2DP.h"

sandbox/experiment-url-webserver_wav/README.md

@@ -0,0 +1,3 @@
+
+I tried to feed the WAV web server with a POST call to a webservice which returns a WAV file.
+This is not working: For some reason the connection is break up and I could not find out why.

sandbox/experiment-url-webserver_wav/experiment-url-webserver_wav.ino

@@ -0,0 +1,38 @@
+#include "AudioTools.h"
+#include "AudioServer.h"
+
+using namespace audio_tools;  
+
+AudioServer server("ssid","password");
+UrlStream url;
+StreamCopy copier; 
+
+// Callback which provides the audio data to Server
+void outputData(Stream &out){
+  Serial.println("providing data...");
+
+  // get sound data from Rhasspy 
+  url.begin("http://192.168.1.37:12101/api/text-to-speech", UrlStream::POST, "text/plain","Hallo, my name is Alice");
+  size_t byte_count = url.available();
+  Serial.print("No of bytes received: ");
+  Serial.println(byte_count);
+
+  copier.begin(out, url);
+  copier.copyAll();
+  
+  Serial.println("Copy done");
+
+}
+
+void setup(){
+  Serial.begin(115200);
+  // start server
+  server.begin(outputData, "audio/wav");  
+}
+
+
+// Arduino loop  
+void loop() {
+  // Handle new connections
+  server.doLoop();  
+}

sandbox/streams-url_wav-i2s/streams-url_wav-i2s.ino

@@ -0,0 +1,46 @@
+/**
+ * @file test-memory_wav-serial.ino
+ * @author Phil Schatzmann
+ * @brief decode WAV stream from url and output it on I2S
+ * @version 0.1
+ * @date 2021-96-25
+ * 
+ * @copyright Copyright (c) 2021
+ 
+ */
+#include "AudioTools.h"
+#include "CodecWAV.h"
+
+using namespace audio_tools;  
+
+// UrlStream -copy-> AudioOutputStream -> WAVDecoder -> I2S
+URLStream url;
+I2SStream i2s;                  // I2S stream 
+WAVDecoder decoder(i2s);        // decode wav to pcm and send it to I2S
+AudioOutputStream out(decoder); // output to decoder
+StreamCopy copier(out, url);    // copy in to out
+
+
+void setup(){
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Debug);  
+
+// url.begin("http://pi.local:5002//api/tts?text=hallo my name is sam")
+//  url.begin("http://192.168.1.37:12101/api/text-to-speech?play=false", UrlStream::POST, "text/plain","Hallo, my name is Alice");
+
+  I2SConfig config = out.defaultConfig(TX_MODE);
+  config.sample_rate = 16000; 
+  config.bits_per_sample = 32;
+  config.channels = 1;
+
+  i2s.begin(config);
+
+}
+
+void loop(){
+  if (wav) {
+    copier.copy();
+  } else {
+    stop();
+  }
+}

src/AudioESP8266.h

@@ -1,32 +1,69 @@
 #pragma once
 
-#ifdef USE_ESP8266_AUDIO
-
-// support for the ESP8266 Audio Library
 #include "AudioTools.h"
+#ifdef USE_ESP8266_AUDIO
 #include "AudioOutput.h"
 #include "SoundData.h"
 
+namespace audio_tools {
 
-class AudioOutputWithCallback : public AudioOutput, public CallbackStream<Channels> {
+/**
+ * @brief ESP8266Audio AudioOutput class which stores the data in a temporary buffer. 
+ * The buffer can be consumed e.g. by a callback function by calling read();
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+class AudioOutputWithCallback : public AudioOutput, public BufferedStream {
     public:
         // Default constructor
-        AudioOutputWithCallback(int bufferSize, int bufferCount ):CallbackStream<Channels>(bufferSize) {
+        AudioOutputWithCallback(int bufferSize, int bufferCount ):BufferedStream(bufferSize) {
+            callback_buffer_ptr = new NBuffer<Channels>(bufferSize, bufferCount);
+        }
+
+        virtual ~AudioOutputWithCallback() {    
+            delete callback_buffer_ptr;
+        }
+
+        /// Activates the output
+        virtual bool begin() { 
+            active = true;
+            return true;
         }
 
-        /// Additinal method for ESP8266 Audio Framework -  puts the sample into a buffer
+        /// puts the sample into a buffer
         virtual bool ConsumeSample(int16_t sample[2]) {
             Channels c;
             c.channel1 = sample[0];
             c.channel2 = sample[1];
             return callback_buffer_ptr->write(c);
         };
+        
+        /// stops the processing
+        virtual bool stop() {
+            active = false;
+            return true;
+        };
 
         /// Provides the data from the internal buffer to the callback
         size_t read(Channels *src, size_t len){
             return active ? this->callback_buffer_ptr->readArray(src, len) : 0;
         }
 
+    
+  protected:
+        NBuffer<Channels> *callback_buffer_ptr;
+        bool active;
+
+        virtual size_t writeExt(const uint8_t* data, size_t len) {    
+            return callback_buffer_ptr->writeArray((Channels*)data, len/sizeof(Channels));
+        }
+
+        virtual size_t readExt( uint8_t *data, size_t len) { 
+            return callback_buffer_ptr->readArray((Channels*)data, len/sizeof(Channels));;
+        }
+
+};
 
 }
-#endif
+
+#endif