udp examples

Author: pschatzmann

examples/sandbox/communication/udp/communication-udp-receive/communication-udp-receive.ino renamed to examples/examples-communication/udp/communication-udp-receive/communication-udp-receive.ino

@@ -1,7 +1,9 @@
 /**
  * @file example-udp-receive.ino
  * @author Phil Schatzmann
- * @brief Receiving audio via udp
+ * @brief Receiving audio via udp.
+ * Because the clocks of the 2 processors are not synchronized, we might get some
+ * buffer overruns or underruns. 
  * @version 0.1
  * @date 2022-03-09
  * 
@@ -12,37 +14,29 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/Communication.h"
+// #include "AudioLibs/AudioKit.h"
 
-uint16_t sample_rate = 44100;
-uint8_t channels = 2;  // The stream will have 2 channels
-I2SStream out; 
-UDPStream udp; 
-const int udpPort = 7000;
-StreamCopy copier(out, udp);     
 const char* ssid="SSID";
 const char* password="password";
+AudioInfo info(22000, 1, 16);
+UDPStream udp(ssid, password); 
+const int udpPort = 7000;
+I2SStream out; // or ony other e.g. AudioKitStream
+StreamCopy copier(out, udp);     
 
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
-  // connect to WIFI
-  WiFi.begin(ssid, password);
-  while (WiFi.status() != WL_CONNECTED) {
-      delay(500);
-      Serial.print(".");
-  }
-  Serial.println();
-
-
-  udp.begin(port);
+  // start UDP receive
+  udp.begin(udpPort);
 
   // start I2S
   Serial.println("starting I2S...");
   auto config = out.defaultConfig(TX_MODE);
-  config.sample_rate = sample_rate; 
-  config.channels = channels;
-  config.bits_per_sample = 16;
+  config.copyFrom(info);
+  config.buffer_size = 1024;
+  config.buffer_count = 20;
   out.begin(config);
 
   Serial.println("started...");

examples/sandbox/communication/udp/communication-udp-send/communication-udp-send.ino renamed to examples/examples-communication/udp/communication-udp-send/communication-udp-send.ino

@@ -1,7 +1,8 @@
 /**
  * @file example-udp-send.ino
  * @author Phil Schatzmann
- * @brief Sending audio over udp
+ * @brief Sending audio over udp. Because the SineWaveGenerator is providing the data as fast 
+ * as possible we need to throttle the speed.
  * @version 0.1
  * @date 2022-03-09
  *
@@ -13,42 +14,33 @@
 #include "AudioTools.h"
 #include "AudioLibs/Communication.h"
 
-uint16_t sample_rate = 44100;
-uint8_t channels = 2;  // The stream will have 2 channels
+const char *ssid = "ssid";
+const char *password = "password";
+AudioInfo info(22000, 1, 16);
 SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound( sineWave);  // Stream generated from sine wave
-UDPStream udp; 
+UDPStream udp(ssid, password); 
 Throttle throttle;
 IPAddress udpAddress(192, 168, 1, 255);
 const int udpPort = 7000;
 StreamCopy copier(udp, sound);  // copies sound into i2s
-const char *ssid = "ssid";
-const char *password = "password";
 
 
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
-  // connect to WIFI
-  WiFi.begin(ssid, password);
-  while (WiFi.status() != WL_CONNECTED) {
-      delay(500);
-      Serial.print(".");
-  }
-  Serial.println();
-  Serial.println(WiFi.localIP());
-
-
   // Define udp address and port
   udp.begin(udpAddress, udpPort);
+
+  // Define Throttle
   auto cfg = throttle.defaultConfig();
-  cfg.channels = channels;
-  cfg.sample_rate = sample_rate;
+  cfg.copyFrom(info);
+  //cfg.correction_ms = 0;
   throttle.begin(cfg);
 
   // Setup sine wave
-  sineWave.begin(channels, sample_rate, N_B4);
+  sineWave.begin(info, N_B4);
   Serial.println("started...");
 }
 

src/AudioLibs/Communication.h

@@ -753,6 +753,12 @@ class Throttle {
     return c;
   }
 
+  void begin(AudioInfo info) {
+    ThrottleConfig cfg;
+    cfg.copyFrom(info);
+    begin(cfg);
+  }
+
   void begin(ThrottleConfig info) {
     this->info = info;
     bytesPerSample = info.bits_per_sample / 8 * info.channels;