MBED Support

pschatzmann · pschatzmann · commit d3ada6f98c4a · 2021-05-14T07:51:48.000+02:00
diff --git a/library.properties b/library.properties
@@ -6,4 +6,4 @@ sentence=Some useful audio processing classes
 paragraph=Timer, RingBuffer, I2S
 category=Device Control
 url=https://github.com/pschatzmann/arduino-audio-tools
-architectures=esp32
+architectures=esp32,mbed_nano
diff --git a/sandbox/experiment-mozzi-udp/README.md b/sandbox/experiment-mozzi-udp/README.md
@@ -1,6 +1,6 @@
 # Using Mozzi with UDP
 
-I am providing a simple integration for [Mozzi](https://sensorium.github.io/Mozzi/).  Unfortunatly I needed to make some small changes to make things work together. Those can be found in my [fork](https://github.com/pschatzmann/Mozzi).
+I am providing a simple integration for [Mozzi](https://sensorium.github.io/Mozzi/).  
 
 We can send the output via TCP/IP or UDP. In this example I am using UDP:
 
diff --git a/sandbox/experiment-mozzi-udp/streams-mozzi-udp.ino b/sandbox/experiment-mozzi-udp/streams-mozzi-udp.ino
diff --git a/sandbox/experiment-mozzi-usb/README.md b/sandbox/experiment-mozzi-usb/README.md
@@ -0,0 +1,12 @@
+# Using Mozzi with USB Audio
+
+I am providing a simple integration for [Mozzi](https://sensorium.github.io/Mozzi/).  
+
+For ARM Mbed devices we can use the microprocessor as USB Audio Device 
+
+
+## Result
+
+No USB Audio available! Hmm, this is stragne...
+
+
diff --git a/sandbox/experiment-mozzi-usb/streams-mozzi-usb.ino b/sandbox/experiment-mozzi-usb/streams-mozzi-usb.ino
@@ -0,0 +1,116 @@
+/**
+ * @file streams-generator-usb.ino
+ * @author Phil Schatzmann
+ * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/streams-generator-usb/README.md
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ * 
+ */
+#include "AudioUSB.h"
+#include "AudioTools.h"
+#include "AudioMozzi.h"
+#include <Oscil.h>
+#include <tables/cos2048_int8.h> // table for Oscils to play
+#include <mozzi_fixmath.h>
+#include <EventDelay.h>
+#include <mozzi_rand.h>
+#include <mozzi_midi.h>
+
+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
+AudioUSB out;                                            // UDP Output - A2DPStream is a singleton!
+StreamCopy copier(out, in); // copy in to out
+
+/// Copied from AMsynth.ino
+#define CONTROL_RATE 64 // Hz, powers of 2 are most reliable
+
+// audio oscils
+Oscil<COS2048_NUM_CELLS, AUDIO_RATE> aCarrier(COS2048_DATA);
+Oscil<COS2048_NUM_CELLS, AUDIO_RATE> aModulator(COS2048_DATA);
+Oscil<COS2048_NUM_CELLS, AUDIO_RATE> aModDepth(COS2048_DATA);
+
+// for scheduling note changes in updateControl()
+EventDelay  kNoteChangeDelay;
+
+// synthesis parameters in fixed point formats
+Q8n8 ratio; // unsigned int with 8 integer bits and 8 fractional bits
+Q24n8 carrier_freq; // unsigned long with 24 integer bits and 8 fractional bits
+Q24n8 mod_freq; // unsigned long with 24 integer bits and 8 fractional bits
+
+// for random notes
+Q8n0 octave_start_note = 42;
+
+
+void setup(){
+  Serial.begin(115200);
+
+  // setup AudioUSB
+  out.begin(mozzi.config().sample_rate,mozzi.config().channels );
+
+  // 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();
+}
+
+void updateControl(){
+  static Q16n16 last_note = octave_start_note;
+
+  if(kNoteChangeDelay.ready()){
+
+    // change octave now and then
+    if(rand((byte)5)==0){
+      last_note = 36+(rand((byte)6)*12);
+    }
+
+    // change step up or down a semitone occasionally
+    if(rand((byte)13)==0){
+      last_note += 1-rand((byte)3);
+    }
+
+    // change modulation ratio now and then
+    if(rand((byte)5)==0){
+      ratio = ((Q8n8) 1+ rand((byte)5)) <<8;
+    }
+
+    // sometimes add a fractionto the ratio
+    if(rand((byte)5)==0){
+      ratio += rand((byte)255);
+    }
+
+    // step up or down 3 semitones (or 0)
+    last_note += 3 * (1-rand((byte)3));
+
+    // convert midi to frequency
+    Q16n16 midi_note = Q8n0_to_Q16n16(last_note);
+    carrier_freq = Q16n16_to_Q24n8(Q16n16_mtof(midi_note));
+
+    // calculate modulation frequency to stay in ratio with carrier
+    mod_freq = (carrier_freq * ratio)>>8; // (Q24n8   Q8n8) >> 8 = Q24n8
+
+      // set frequencies of the oscillators
+    aCarrier.setFreq_Q24n8(carrier_freq);
+    aModulator.setFreq_Q24n8(mod_freq);
+
+    // reset the note scheduler
+    kNoteChangeDelay.start();
+  }
+}
+
+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/src/AudioConfig.h b/src/AudioConfig.h
@@ -45,6 +45,7 @@
  */
 #ifdef ESP32
 #include "esp32-hal-log.h"
+#define I2S_SUPPORT
 #define PIN_I2S_BCK 14
 #define PIN_I2S_WS 15
 #define PIN_I2S_DATA_IN 32
@@ -56,6 +57,7 @@
 #endif
 
 #ifdef ESP8266
+#define I2S_SUPPORT
 #define PIN_I2S_BCK -1
 #define PIN_I2S_WS -1
 #define PIN_I2S_DATA_IN -1
diff --git a/src/AudioMozzi.h b/src/AudioMozzi.h
@@ -3,9 +3,8 @@
 #include "mozzi_config.h"
 #include "hardware_defines.h"
 #include "mozzi_analog.h"
-#include "MozziGuts.h"
+#include "Mozzi.h"
 
-extern uint64_t samples_written_to_buffer;
 
 namespace audio_tools {
 
@@ -54,6 +53,7 @@ class MozziGenerator : public SoundGenerator<int16_t> {
         AudioBaseInfo info;
         int control_counter_max;
         int control_counter;
+        uint64_t samples_written_to_buffer;
 
 };
 
diff --git a/src/AudioTools/AudioI2S.h b/src/AudioTools/AudioI2S.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "AudioConfig.h"
+#ifdef I2S_SUPPORT
 #include "AudioTypes.h"
 #include "I2S_ESP32.h"
 #include "I2S_ESP8266.h"
@@ -48,3 +49,5 @@ class I2S : public I2SBase {
 
 
 }
+
+#endif
diff --git a/src/AudioTools/AudioLogger.h b/src/AudioTools/AudioLogger.h
@@ -2,6 +2,7 @@
 
 #include "AudioConfig.h"
 #include "Stream.h"
+#include <cstdarg>
 
 #ifndef PRINTF_BUFFER_SIZE
 #define PRINTF_BUFFER_SIZE 160
diff --git a/src/AudioTools/AudioTypes.h b/src/AudioTools/AudioTypes.h
@@ -121,6 +121,8 @@ enum I2SMode {
 };
 
 
+#ifdef I2S_SUPPORT
+
 /**
  * @brief configuration for all common i2s settings
  * @author Phil Schatzmann
@@ -156,6 +158,7 @@ class I2SConfig {
 
 };
 
+#endif
 
 /**
  * @brief E.g. used by Encoders and Decoders
diff --git a/src/AudioTools/Streams.h b/src/AudioTools/Streams.h
@@ -372,6 +372,8 @@ class AudioOutputStream : public BufferedStream {
 };
 
 
+#ifdef I2S_SUPPORT
+
 /**
  * @brief We support the Stream interface for the I2S access. In addition we allow a separate mute pin which might also be used
  * to drive a LED... 
@@ -443,6 +445,8 @@ class I2SStream : public BufferedStream, public AudioBaseInfoDependent  {
 
 };
 
+#endif
+
 #ifdef ESP32
 
 /**
diff --git a/src/AudioUSB.h b/src/AudioUSB.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#if! __has_include("mbed.h") 
+#error "This functionality is only supported on ARM Mbed devices"
+#endif
+
+#include "mbed.h"
+#include "USBAudio.h"
+#include "AudioTools.h"
+
+
+namespace audio_tools {
+
+/**
+* Stream support for mbed USBAudio https://os.mbed.com/docs/mbed-os/v6.10/mbed-os-api-doxy/class_u_s_b_audio.html
+*/
+class AudioUSB : public BufferedStream {
+    public:
+        AudioUSB():BufferedStream(DEFAULT_BUFFER_SIZE){
+        }
+
+        ~AudioUSB(){
+            end();
+        } 
+
+        void begin(uint32_t frequency_tx=8000, uint8_t channel_count_tx=1, uint32_t frequency_rx=48000, uint8_t channel_count_rx=1,  uint32_t buffer_ms=10, uint16_t vendor_id=0x7bb8, uint16_t product_id=0x1111, uint16_t product_release=0x0100){
+            if (audio!=nullptr) {
+                audio = new USBAudio(true,frequency_rx,channel_count_rx,frequency_tx,channel_count_tx,buffer_ms,vendor_id,product_id,product_release);
+            }
+        }
+
+        void end(){
+            if (audio!=nullptr)
+                delete audio;
+            audio = nullptr;
+        }
+
+        operator bool() {
+            return audio != nullptr;
+        }
+
+    protected:
+        USBAudio *audio = nullptr;
+
+        virtual size_t writeExt(const uint8_t* data, size_t len){
+            if (audio==nullptr) return 0;
+            bool result = audio->write((uint8_t*)data, len);
+            return result ? len : 0;
+        }
+
+        virtual size_t readExt( uint8_t *data, size_t len){
+            if (audio==nullptr) return 0;
+            bool result = audio->read(data, len);
+            return result ? len : 0;
+        }
+};
+
+}
diff --git a/src/CodecAAC.h b/src/CodecAAC.h
@@ -67,11 +67,21 @@ class AACDecoder : public AudioWriter  {
             return result;
         }
 
-        // provides information about the stream
-        CStreamInfo &info(){
+        // provides detailed information about the stream
+        CStreamInfo &infoEx(){
             return *aacDecoder_GetStreamInfo(aacDecoderInfo);
         }
 
+		// provides common information
+		AudioBaseInfo &info() {
+			AudioBaseInfo result;
+			CStreamInfo& i = infoEx();
+			result.channels = i.numChannels;
+			result.sample_rate = i.sampleRate;
+			result.bits_per_sample = 16;
+			return result;
+		}
+
         // release the resources
         void close(){
             if (aacDecoderInfo!=nullptr){
