SAM

Author: pschatzmann

README.md

@@ -95,7 +95,7 @@ Here are a couple of simple test sketches to demo different output destinations:
 
 And some more useful examples:
 
-- [streams-memory_raw-i2s](examples/streams-memory_raw-i2s) - Play music form Flash Memory via I2S to External DAC
+- [streams-memory_raw-i2s](/examples/streams-memory_raw-i2s) - Play music form Flash Memory via I2S to External DAC
 - [streams-url_raw-serial](/examples/streams-url_raw-serial) Displaying a music file from the internet on the Serial Plotter
 - [streams-url_raw-I2S.ino](/examples/streams-url_raw-i2s) Streaming a File from the Internet to on external DAC via I2S
 - [streams-mozzi-a2dp](/examples/streams-mozzi-a2dp) Use Mozzi to generate Sound to be sent to a Bluetooth Speaker
@@ -112,6 +112,12 @@ And some more useful examples:
 - [base-i2s-serial](basic-api/base-i2s-serial) - Sample digital sound and write it to Serial
 - [base-i2s-a2dp](basic-api/base-i2s-a2dp) - Sample analog sound and write it to a A2DP Bluetooth source 
 
+#### Listening to the Result with a Webbrowser
+
+I am providing a simple webserver which can render the audio data as wav result. Here are some examples
+
+- [streams-generator-webserver](/examples/streams-generator-webserver) A Webserver which renders some generated sound
+- [streams-sam-webserver](/examples/streams-sam-webserver) A Webserver which renders the result from the SAM TTS engine
 
 
 ## Optional Libraries
@@ -123,7 +129,7 @@ Dependent on the example you might need to install some of the following librari
 - [SD Library](https://www.arduino.cc/en/reference/SD) to read and write files.
 - [arduino-fdk-aac](https://github.com/pschatzmann/arduino-fdk-aac) to encode or decode AAC 
 - [Mozzi](https://github.com/pschatzmann/Mozzi) A sound synthesis library for Arduino
-
+- [SAM](https://github.com/pschatzmann/SAM) A Text to Speach Engine
 
 ## Installation
 

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

@@ -1,108 +1,36 @@
-#include <WiFi.h>
 #include "AudioTools.h"
+#include "AudioWAVServer.h"
 
 using namespace audio_tools;
 
 // WIFI
 const char *ssid = "ssid";
 const char *password = "password";
-WiFiServer server(80);
-WiFiClient client;
+
+AudioWAVServer server(ssid, password);
 
 // Sound Generation
 const int sample_rate = 10000;
-const int data_length = 100000;
 const int channels = 1;
 
 SineWaveGenerator<int16_t> sineWave;                      // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> in(sineWave, channels);     // Stream generated from sine wave
-StreamCopy copier;                                        // buffered copy
-WAVEncoder encoder;
-AudioOutputStream wav_stream(encoder); // WAV output stream
 
 
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial,AudioLogger::Debug);
 
-  WiFi.begin(ssid, password);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-
-  Serial.println("");
-  Serial.println("WiFi connected.");
-  Serial.println("IP address: ");
-  Serial.println(WiFi.localIP());
-
   // start server
-  server.begin();
+  server.begin(in, sample_rate, channels);
 
   // start generation of sound
   sineWave.begin(sample_rate, B4);
   in.begin();
 }
 
-// Handle an new client connection and return the data
-void processClient() {
-  if (client)  { // if you get a client,
-    Serial.println("New Client."); // print a message out the serial port
-    String currentLine = "";       // make a String to hold incoming data from the client
-    while (client.connected()) { // loop while the client's connected
-      if (client.available()) { // if there's bytes to read from the client,
-        char c = client.read(); // read a byte, then
-        Serial.write(c);        // print it out the serial monitor
-        if (c == '\n') { // if the byte is a newline character
-
-          // if the current line is blank, you got two newline characters in a row.
-          // that's the end of the client HTTP request, so send a response:
-          if (currentLine.length() == 0){
-            // HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
-            // and a content-type so the client knows what's coming, then a blank line:
-            client.println("HTTP/1.1 200 OK");
-            client.println("Content-type:audio/wav");
-            client.println();
-
-            // set up wav encoder
-            auto config = encoder.defaultConfig();
-            config.channels = channels;
-            config.sample_rate = sample_rate;
-            //config.data_length = data_length;
-            config.is_streamed = true;
-            encoder.begin(client, config);
-
-            Serial.println("Returning WAV stream...");
-            copier.begin(wav_stream, in);
-            // break out of the while loop:
-            break;
-          } else { // if you got a newline, then clear currentLine:
-            currentLine = "";
-          }
-        }
-        else if (c != '\r')
-        { // if you got anything else but a carriage return character,
-          currentLine += c; // add it to the end of the currentLine
-        }
-      }
-    }
-  }  
-}
 
 // copy the data
 void loop() {
-  if (!client.connected()) {
-    client = server.available(); // listen for incoming clients
-    processClient();
-  } else {
-    // We are connected: copy input from source to wav output
-    if (encoder){
-      copier.copy();
-      // if we limit the size of the WAV the encoder gets automatically closed when all has been sent
-      if (!encoder) {
-        Serial.println("stop client...");
-        client.stop();
-      }
-    }
-  }
+  server.doLoop();
 }

examples/streams-sam-webserver_wav/README.md

@@ -0,0 +1,7 @@
+# Using SAM Speach to Text
+
+I am providing a simple sketch which generates sound data with the SAM text to speach engine.
+You need to install https://github.com/pschatzmann/SAM
+
+In this demo we provide the result as WAV stream which can be listened to in a Web Browser
+

sandbox/experiment-sam-webserver/experiment-sam-webserver.ino renamed to examples/streams-sam-webserver_wav/streams-sam-webserver_wav.ino

@@ -6,30 +6,28 @@
  * @copyright GPLv3
  * 
  */
-#include "AudioTools.h"
-#include "AudioWAVServer.h"
 #include "sam_arduino.h"
 
 using namespace audio_tools;  
 
-extern const char *alice;
-AudioWAVServer server("network", "password");
+AudioWAVServer server("ssid","password");
 int channels = 1;
-int audio_rate = 22050; 
-
+int bits_per_sample = 8;
 
 // Callback which provides the audio data 
 void outputData(Stream &out){
-  Serial.println("providing audio data...");
-  SAM sam(out, false, channels);
-  sam.say(alice);
+  Serial.print("providing data...");
+  SAM sam(out,  false);
+  sam.setOutputChannels(channels);
+  sam.setBitsPerSample(bits_per_sample);
+
+  sam.say("hallo, I am SAM");
 }
 
 void setup(){
   Serial.begin(115200);
-
   // start data sink
-  server.begin(outputData, audio_rate, channels);
+  server.begin(outputData, SAM::sampleRate(), channels, bits_per_sample);
 }