Support for PortAudio

pschatzmann · pschatzmann · commit da17b01afd75 · 2021-07-24T09:11:27.000+02:00
diff --git a/examples/desktop/CMakeLists.txt b/examples/desktop/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.0)
+
+# set the project name
+project(desktop)
+
+# Build with arduino-audio-tools
+FetchContent_Declare(arduino_audio_tools GIT_REPOSITORY "https://github.com/pschatzmann/arduino-audio-tools.git" GIT_TAG main )
+FetchContent_GetProperties(arduino_audio_tools)
+if(NOT arduino_audio_tools_POPULATED)
+    FetchContent_Populate(arduino_audio_tools)
+    add_subdirectory(${arduino_audio_tools_SOURCE_DIR})
+endif()
+
+# Build with Linux Arduino Emulator
+FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
+FetchContent_GetProperties(arduino_emulator)
+if(NOT arduino_emulator_POPULATED)
+    FetchContent_Populate(arduino_emulator)
+    add_subdirectory(${arduino_emulator_SOURCE_DIR})
+endif()
+
+# Build with Portaudio 
+FetchContent_Declare(portaudio GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
+FetchContent_GetProperties(portaudio)
+if(NOT portaudio_POPULATED)
+    FetchContent_Populate(portaudio)
+    add_subdirectory(${portaudio_SOURCE_DIR})
+endif()
+
+
+# build sketch to executable
+add_executable (desktop desktop_example.cpp)
+
diff --git a/examples/desktop/README.md b/examples/desktop/README.md
@@ -0,0 +1,4 @@
+# Desktop Implementation
+
+We provide some generic output which will work on Linux, Windows and OS/X
+The provided cmake is downloading all dependencies and builds an executable from the sketch
diff --git a/examples/desktop/desktop_example.cpp b/examples/desktop/desktop_example.cpp
@@ -0,0 +1,32 @@
+#include "Arduino.h"
+#include "AudioTools.h"
+
+using namespace audio_tools;  
+
+typedef int16_t sound_t;                                  // sound will be represented as int16_t (with 2 bytes)
+uint16_t sample_rate=44100;
+uint8_t channels = 2;                                     // The stream will have 2 channels 
+SineWaveGenerator<sound_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<sound_t> in(sineWave, channels);     // Stream generated from sine wave
+DefaultStream out = DefaultStream::instance() ;                 // A2DP input - A2DPStream is a singleton!
+StreamCopy copier(out, in); // copy in to out
+
+// Arduino Setup
+void setup(void) {
+  Serial.begin(115200);
+
+  // We send the test signal via A2DP - so we conect to the MyMusic Bluetooth Speaker
+  out.begin(TX_MODE, "MyMusic");
+
+  Serial.println("A2DP is connected now...");
+
+  // Setup sine wave
+  sineWave.begin(sample_rate, B4);
+
+}
+
+// Arduino loop  
+void loop() {
+  if (out)
+    copier.copy();
+}
diff --git a/sandbox/streams-mozzi-a2dp/streams-mozzi-a2dp.ino b/sandbox/streams-mozzi-a2dp/streams-mozzi-a2dp.ino
@@ -1,5 +1,5 @@
 /**
- * @file streams-generator-a2dp.ino
+ * @file streams-mozzi-a2dp.ino
  * @author Phil Schatzmann
  * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/streams-generator-a2dp/README.md
  * 
@@ -19,11 +19,8 @@
 
 using namespace audio_tools;  
 
-typedef int16_t sound_t;                                  // sound will be represented as int16_t (with 2 bytes)
-uint8_t channels = 2;                                     // The stream will have 2 channels 
-MozziGenerator mozzi(CONTROL_RATE);                       // subclass of SoundGenerator 
-GeneratedSoundStream<sound_t> in(mozzi, channels);        // Stream generated with mozzi
-A2DPStream out = A2DPStream::instance() ;                 // A2DP output - A2DPStream is a singleton!
+MozziStream in;                              // Stream generated with mozzi
+A2DPStream out = A2DPStream::instance() ;    // A2DP output - A2DPStream is a singleton!
 StreamCopy copier(out, in); // copy in to out
 
 /// Copied from AMsynth.ino
@@ -45,24 +42,33 @@ Q24n8 mod_freq; // unsigned long with 24 integer bits and 8 fractional bits
 // for random notes
 Q8n0 octave_start_note = 42;
 
-
+// Setup Mozzi and A2DP
 void setup(){
   Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
 
-  if (mozzi.config().sample_rate!=44100){
-    Serial.println("Please set the AUDIO_RATE in the mozzi_config.h to 44100");
-    stop();
-  }
+  // setup MozziStream
+  auto cfg = in.defaultConfig();
+  cfg.channels = 2;
+  cfg.updateAudio = updateAudio;
+  cfg.updateControl = updateControl;
+  in.begin(cfg);
 
   // We send the test signal via A2DP - so we conect to the MyMusic Bluetooth Speaker
   out.begin(TX_MODE, "MyMusic");
   Serial.println("A2DP is connected now...");
 
+  // setup Mozzi 
   ratio = float_to_Q8n8(3.0f);   // define modulation ratio in float and convert to fixed-point
   kNoteChangeDelay.set(200); // note duration ms, within resolution of CONTROL_RATE
   aModDepth.setFreq(13.f);     // vary mod depth to highlight am effects
   randSeed(); // reseed the random generator for different results each time the sketch runs
-  in.begin();
+}
+
+// Arduino loop  
+void loop() {
+  if (out)
+    copier.copy();
 }
 
 void updateControl(){
@@ -113,9 +119,3 @@ AudioOutput_t updateAudio(){
   int32_t mod = (128u+ aModulator.next()) * ((byte)128+ aModDepth.next());
   return MonoOutput::fromNBit(24, mod * aCarrier.next());
 }
-
-// Arduino loop  
-void loop() {
-  if (out)
-    copier.copy();
-}
diff --git a/sandbox/streams-mozzi-webserver/streams-mozzi-webserver.ino b/sandbox/streams-mozzi-webserver/streams-mozzi-webserver.ino
@@ -18,8 +18,6 @@
 
 using namespace audio_tools;  
 
-typedef int16_t sound_t;                                  // sound will be represented as int16_t (with 2 bytes)
-uint8_t channels = 2;                                     // The stream will have 2 channels 
 MozziStream mozzi;
 AudioWAVServer server("ssid","password");
 
@@ -49,10 +47,13 @@ void setup(){
 
   // configure mozzi
   auto cfg = mozzi.defaultConfig();
+  cfg.channels = 1;
+  cfg.updateAudio = updateAudio;
+  cfg.updateControl = updateControl;
   mozzi.begin(cfg);
   
-  // We connect to the server  
-  server.begin(mozzi, cfg.sample_rate, cfg.channels);
+  // We start to the server  
+  server.begin(mozzi, cfg.sample_rate, cfg.channels, cfg.bits_per_sample);
 
   // Start Mozzi
   ratio = float_to_Q8n8(3.0f);  // define modulation ratio in float and convert to fixed-point
diff --git a/src/AudioConfig.h b/src/AudioConfig.h
@@ -101,3 +101,14 @@
 #define SOFT_MUTE_VALUE LOW  
 #endif
 
+
+/**
+ * ------------------------------------------------------------------------- 
+ * @brief typedefs for DefaultStream
+ * 
+ */
+#if defined(__linux__) || defined(_WIN32) || defined(__APPLE__)
+typedef PortAudioStream DefaultStream 
+#elif defined(ESP32) || defined(ESP8266) || defined(__SAMD21G18A__)
+typedef A2DPStream DefaultStream
+#endif
diff --git a/src/AudioMozzi.h b/src/AudioMozzi.h
@@ -12,14 +12,14 @@ namespace audio_tools {
  * 
  */
 struct MozziConfig : AudioBaseInfo {
-    uint16_t control_rate=0;
+    uint16_t control_rate=CONTROL_RATE;
     void (*updateControl)() = nullptr; //&::updateControl;
     AudioOutput_t (*updateAudio)() = nullptr; // = &::updateAudio;
 
     MozziConfig(){
         channels = AUDIO_CHANNELS;
         sample_rate = AUDIO_RATE;
-        bits_per_sample = sizeof(AudioOutputStorage_t)*8;
+        bits_per_sample = 16;
     }
 };
 /**
@@ -33,7 +33,7 @@ struct MozziConfig : AudioBaseInfo {
  * @copyright GPLv3
  */
  
-class MozziGenerator : public SoundGenerator<AudioOutputStorage_t> {
+class MozziGenerator : public SoundGenerator<int16_t> {
     public:
         MozziGenerator(){   
 	 		LOGD(__FUNCTION__);
@@ -48,6 +48,7 @@ class MozziGenerator : public SoundGenerator<AudioOutputStorage_t> {
         }
 
         void begin(MozziConfig config){
+            SoundGenerator<int16_t>::begin();
             info = config;
             if (info.control_rate==0){
                 info.control_rate = CONTROL_RATE;
@@ -65,14 +66,14 @@ class MozziGenerator : public SoundGenerator<AudioOutputStorage_t> {
         }
 
         /// Provides a single sample
-        virtual AudioOutputStorage_t readSample() {
+        virtual int16_t readSample() {
             if (info.updateAudio==nullptr){
-                LOGE("The updateAudio method has not been defined!");
-                end();
+                LOGE("The updateAudio method has not been defined in the configuration !");
+                stop();
                 return 0;
             }
 
-            // return prior right value from buffer
+            // return value from buffer -> channel 2 
             if (is_read_buffer_filled){
                 // for stereo output we might have the value already
                 is_read_buffer_filled = false;
@@ -83,12 +84,13 @@ class MozziGenerator : public SoundGenerator<AudioOutputStorage_t> {
             if (--control_counter<0){
                 control_counter = control_counter_max;
                 if (info.updateControl!=nullptr){
+                    LOGD("updateControl");
                     info.updateControl();
                 }
             }
 
             // return left value
-            AudioOutputStorage_t result = updateSample();
+            int16_t result = updateSample();
             return result;
         }
 
@@ -100,30 +102,30 @@ class MozziGenerator : public SoundGenerator<AudioOutputStorage_t> {
         bool is_read_buffer_filled = false;
 
 
-        AudioOutputStorage_t updateSample(){
+        // we make sure that we return one sample for each 
+        // requested number of channels sequentially
+        int16_t updateSample(){
             AudioOutput out = info.updateAudio();
             // requested mono
-            AudioOutputStorage_t result = 0;
+            int16_t result = 0;
             #if (AUDIO_CHANNELS == MONO)
-                // generated stereo
-                if (sizeof(out) == sizeof(AudioOutputStorage_t)*2){
-                    result = out[0]/2 + out[1]/2;
-                // generated mono
-                } else  if (sizeof(out) == sizeof(AudioOutputStorage_t)){
+                if (info.channels==2){
+                    result = out[0];
+                    read_buffer = out[0];
+                    is_read_buffer_filled = true;
+                } else  if (info.channels==1){
                     result = out[0];
                 }
 
             // requested stereo
             #elif (AUDIO_CHANNELS == STEREO)
                 result = out[0];
-                // generated stereo
-                if (sizeof(out) == sizeof(AudioOutputStorage_t)*2){
+                if (info.channels==2){
+                    result = out[0];
                     read_buffer = out[1];
                     is_read_buffer_filled = true;
-                // generated mono
-                } else if (sizeof(out) == sizeof(AudioOutputStorage_t)){
-                    read_buffer = out[0];
-                    is_read_buffer_filled = true;
+                } else if (info.channels==1){
+                    result = out[0]/2 + out[1]/2;
                 }
             #endif
             return result;
@@ -172,14 +174,11 @@ class MozziStream : public Stream {
             config = cfg;
             Mozzi.setAudioRate(config.sample_rate);
             // in output mode we do not allocate any unnecessary functionality
-            if (input_ptr == nullptr && config.control_rate>0){
-                input_ptr = new MozziGenerator(config);
-            }
             if (cfg.channels != config.channels){
                 LOGE("You need to change the AUDIO_CHANNELS in mozzi_config.h to %d", cfg.channels);
             }
 
-            Mozzi.start(0);
+            Mozzi.start(config.control_rate);
         }
 
         void end(){
@@ -205,6 +204,7 @@ class MozziStream : public Stream {
         virtual size_t write(const uint8_t *buffer, size_t size) {
             for (size_t j=0;j<size;j++){
                 if (write(buffer[j])<=0){
+                    LOGE("Could not write all data: %d of %d", j, size);
                     return j;
                 }
             }
@@ -216,7 +216,8 @@ class MozziStream : public Stream {
         }
 
         virtual size_t readBytes(char *buffer, size_t length){
-            return input_ptr==nullptr ? 0 : input_ptr->readBytes((uint8_t*)buffer, length);
+            LOGD("readBytes: %d", length);
+            return get_input_ptr()->readBytes((uint8_t*)buffer, length, config.channels);
         }
 
         virtual int read(){
@@ -240,6 +241,17 @@ class MozziStream : public Stream {
         uint8_t buffer[64];
         int buffer_pos;
 
+        MozziGenerator *get_input_ptr(){
+            if (input_ptr==nullptr){
+                // allocate  generator only when requested
+                if (config.control_rate>0){
+                    config.control_rate = CONTROL_RATE;
+                }
+                input_ptr = new MozziGenerator(config);
+            }
+            return input_ptr;
+        }
+
         // writes individual bytes and puts them together as MonoOutput or StereoOutput
         void writeChar(uint8_t c){
             buffer[buffer_pos++] = c;
diff --git a/src/AudioTools.h b/src/AudioTools.h
@@ -20,6 +20,7 @@
 #include "AudioTools/Streams.h"
 #include "AudioTools/AudioCopy.h"
 #include "AudioTools/AudioPWM.h"
+#include "AudioTools/PortAudioStream.h"
 
 #ifdef USE_URL_ARDUINO
 // Arduino network support (incl ESP32)
diff --git a/src/AudioTools/AudioCopy.h b/src/AudioTools/AudioCopy.h
@@ -61,7 +61,7 @@ class StreamCopyT {
                 size_t samples = bytes_to_read / sizeof(T);
                 bytes_to_read = samples * sizeof(T);
                 size_t bytes_read = from->readBytes(buffer, bytes_to_read);
-                result = write(bytes_read,delayCount);
+                result = write(bytes_read, delayCount);
             } 
             LOGI("StreamCopy::copy %u -> %u bytes - in %d hops", bytes_to_read, result, delayCount);
             return result;
@@ -123,14 +123,14 @@ class StreamCopyT {
             while(total<len){
                 size_t written = to->write(buffer+total, len-total);
                 total += written;
-                yield();
                 delayCount++;
 
-                if (retry++ > 10){
+                if (retry++ > 20){
                     break;
                 }
                 
                 if (retry>1) {
+                    delay(5);
                     LOGI("try write - %d ",retry);
                 }
 
diff --git a/src/AudioTools/PortAudioStream.h b/src/AudioTools/PortAudioStream.h
diff --git a/src/AudioTools/SoundGenerator.h b/src/AudioTools/SoundGenerator.h
