AudioServerEx DRAFT

Author: pschatzmann

examples/examples-webserver/streams-effect-webserver_wav/streams-effect-webserver_wav.ino

@@ -55,5 +55,5 @@ void setup() {
 
 // copy the data
 void loop() {
-  server.doLoop();
+  server.copy();
 }

examples/examples-webserver/streams-flite-webserver_wav/streams-flite-webserver_wav.ino

@@ -32,5 +32,5 @@ void setup(){
 // Arduino loop  
 void loop() {
   // Handle new connections
-  server.doLoop();  
+  server.copy();  
 }

examples/examples-webserver/streams-generator-webserver_wav/streams-generator-webserver_wav.ino

@@ -39,5 +39,5 @@ void setup() {
 
 // copy the data
 void loop() {
-  server.doLoop();
+  server.copy();
 }

examples/examples-webserver/streams-i2s-webserver_wav/streams-i2s-webserver_wav.ino

@@ -36,5 +36,5 @@ void setup(){
 // Arduino loop  
 void loop() {
   // Handle new connections
-  server.doLoop();  
+  server.copy();  
 }

examples/examples-webserver/streams-sam-webserver_wav/streams-sam-webserver_wav.ino

@@ -28,5 +28,5 @@ void setup(){
 // Arduino loop  
 void loop() {
   // Handle new connections
-  server.doLoop();  
+  server.copy();  
 }

examples/examples-webserver/streams-tts-webserver_wav/streams-tts-webserver_wav.ino

@@ -29,5 +29,5 @@ void setup(){
 // Arduino loop  
 void loop() {
   // Handle new connections
-  server.doLoop();  
+  server.copy();  
 }

src/AudioCodecs/CodecWAV.h

@@ -478,9 +478,7 @@ class WAVEncoder : public AudioEncoder {
             }
             if (!header_written){
                 LOGI("Writing Header");
-                writeRiffHeader();
-                writeFMT();
-                writeDataHeader();
+                writeHeader(stream_ptr);
                 header_written = true;
             }
 
@@ -514,6 +512,12 @@ class WAVEncoder : public AudioEncoder {
             this->offset = offset;
         }
 
+        void writeHeader(Print *out) {
+            writeRiffHeader(out);
+            writeFMT(out);
+            writeDataHeader(out);
+        }
+
     protected:
         Print* stream_ptr;
         WAVAudioInfo audioInfo = defaultConfig();
@@ -522,13 +526,14 @@ class WAVEncoder : public AudioEncoder {
         volatile bool is_open;
         uint32_t offset=0; //adds n empty bytes at the beginning of the data
 
-        void writeRiffHeader(){
+
+        void writeRiffHeader(Print *stream_ptr){
             stream_ptr->write("RIFF",4);
             write32(*stream_ptr, audioInfo.file_size-8);
             stream_ptr->write("WAVE",4);
         }
 
-        void writeFMT(){
+        void writeFMT(Print *stream_ptr){
             uint16_t fmt_len = 16;
             uint32_t byteRate = audioInfo.sample_rate * audioInfo.bits_per_sample * audioInfo.channels / 8;
             uint32_t frame_size = audioInfo.channels * audioInfo.bits_per_sample / 8;
@@ -550,7 +555,7 @@ class WAVEncoder : public AudioEncoder {
             stream.write((uint8_t *) &value, 2);
         }
 
-        void writeDataHeader() {
+        void writeDataHeader(Print *stream_ptr) {
             stream_ptr->write("data",4);
             audioInfo.file_size -=44;
             write32(*stream_ptr, audioInfo.file_size);
@@ -559,7 +564,6 @@ class WAVEncoder : public AudioEncoder {
                 memset(empty,0, offset);
                 stream_ptr->write(empty,offset);  // resolve issue with wrong aligment
             }
-
         }
 
 };

src/AudioLibs/AudioServerEx.h

@@ -0,0 +1,170 @@
+#pragma once
+
+#include "AudioConfig.h"
+#include "AudioTools/AudioOutput.h"
+#include "AudioCodecs/CodecWAV.h"
+#include "HttpServer.h"
+#include "HttpExtensions.h"
+
+namespace audio_tools {
+
+/**
+ * @brief Config information for AudioServerEx
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+struct AudioServerExConfig : public AudioBaseInfo {
+    const char* mime = nullptr;
+    const char* ssid = nullptr;
+    const char* password = nullptr;
+    const char* path = "/";
+    // optional input; if not used use write methods to push data
+    Stream *input=nullptr;
+    int port = 80;
+};
+
+/**
+ * @brief A powerfull Web server which is based on 
+ * https://github.com/pschatzmann/TinyHttp.
+ * It supports multiple concurrent clients. You can e.g. use it to write mp3 data and make
+ * it available in multiple clients.
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+class AudioServerEx : public AudioPrint {
+  public:
+    // Default Constructor
+    AudioServerEx() = default;
+
+    /// To be compatible with legacy API
+    AudioServerEx(const char *ssid, const char* pwd){
+        info.ssid = ssid;
+        info.password = pwd;
+    }
+
+    AudioServerExConfig defaultConfig() {
+        AudioServerExConfig cfg;
+        return cfg;
+    }
+
+    bool begin(AudioServerExConfig cfg) {
+        info = cfg;
+        return begin();
+    }
+
+    bool begin(Stream &in, const char* contentType) {
+        info.input = ∈
+        info.mime = contentType;
+        return begin();
+    }
+
+    bool begin() {
+        end(); // we (re) start with  a clean state
+        if (info.input==nullptr){
+            p_stream = new ExtensionStream(info.path,tinyhttp::GET, info.mime );
+        } else {
+            p_stream = new ExtensionStream(info.path, info.mime, *info.input);
+        }
+        p_stream->setReplyHeader(*getReplyHeader()); 
+        p_server = new HttpServer(wifi);
+        p_server->addExtension(*p_stream);
+        return p_server->begin(info.port, info.ssid, info.password);
+    }
+
+    void end() {
+        if (p_stream!=nullptr) {
+            delete p_stream;
+            p_stream = nullptr;
+        }
+        if (p_server!=nullptr) {
+            delete p_server;
+            p_server = nullptr;
+        }
+    }
+
+    /// Web server supports write so that we can e.g. use is as destination for the audio player.
+    size_t write(const uint8_t* data, size_t len) override {
+        if (p_stream==nullptr) return 0;
+        return p_stream->write((uint8_t*)data, len);
+    }
+
+    int availableForWrite() override {
+        if (p_stream==nullptr) return 0;
+        return p_stream->availableForWrite();
+    }
+
+    /// Needs to be called if the data was provided as input Stream in the AudioServerExConfig
+    void copy() {
+        if (p_server!=nullptr){
+            p_server->copy();
+        }
+    }
+
+  protected:
+    AudioServerExConfig info;
+    WiFiServer wifi;
+    HttpServer *p_server;
+    ExtensionStream *p_stream=nullptr;
+
+    virtual tinyhttp::Str* getReplyHeader() {
+        return nullptr;
+    }
+
+};
+
+/**
+ * @brief A powerfull WAV Web server which is based on 
+ * https://github.com/pschatzmann/TinyHttp.
+ * It supports multiple concurrent clients
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ * 
+ */
+class AudioWAVServerEx : public AudioServerEx {
+    public:
+        // Default Constructor
+        AudioWAVServerEx() = default;
+
+        /// To be compatible with legacy API
+        AudioWAVServerEx(const char *ssid, const char* pwd):AudioServerEx(ssid, pwd){}
+
+        /// Legacy API support
+        bool begin(Stream &in, int sample_rate, int channels, int bits_per_sample=16) {
+            info.input = ∈
+            info.sample_rate = sample_rate;
+            info.channels = channels;
+            info. bits_per_sample = bits_per_sample;
+            info.mime = "audio/wav";
+            return AudioServerEx::begin();
+        }
+
+        AudioServerExConfig defaultConfig() {
+            AudioServerExConfig cfg;
+            cfg.mime = "audio/wav";
+            return cfg;
+        }
+
+    protected:
+        // wav files start with a 44 bytes header
+        virtual tinyhttp::Str* getReplyHeader() {
+            MemoryPrint mp{(uint8_t*)header.c_str(), header.length()};
+            WAVEncoder enc;
+            WAVAudioInfo wi;
+            wi.sample_rate = info.sample_rate;
+            wi.bits_per_sample = info.bits_per_sample;
+            wi.channels = info.channels;
+            enc.setAudioInfo(wi);
+            // fill header with data
+            enc.writeHeader(&mp);
+
+            return &header;
+        }
+
+        // Allocate memory for 44 bytes header
+        tinyhttp::StrExt header{44};
+
+};
+
+}

src/AudioTools/AudioOutput.h

@@ -28,6 +28,10 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
             return 1;
         }
 
+        virtual int availableForWrtie() {
+            return 0;
+        }
+
         void flush() FLUSH_OVERRIDE {
             write((const uint8_t*)tmp, tmpPos-1);
             tmpPos=0;
@@ -659,5 +663,40 @@ class VolumePrint : public AudioPrint {
         }
 };
 
+/**
+ * @brief Prints to a preallocated memory
+ */
+class MemoryPrint : public AudioPrint {
+    public:
+        MemoryPrint(uint8_t*start, int len){
+            p_start = start;
+            p_next = start;
+            size = len;
+        }
+
+        size_t write(const uint8_t *buffer, size_t len) override {
+            if (pos+len<=size){
+                memcpy(p_next, buffer,len);
+                pos+=len;
+                p_next+=len;
+                return len;
+            } else {
+                LOGE("Buffer too small");
+                return 0;
+            }
+        }
+
+        int availableForWrite() {
+            return size-pos;
+        }
+        
+    protected:
+        int pos;
+        uint8_t* p_start;
+        uint8_t *p_next;
+        size_t size;
+
+};
+
 
 } //n namespace