A2DP basic examples corrections

Author: pschatzmann

examples/examples-basic-api/base-adc-a2dp/base-adc-a2dp.ino

@@ -22,14 +22,13 @@ BluetoothA2DPSource a2dp_source;
 ConverterScaler<int16_t> scaler(1.0, -26427, 32700 );
 
 // callback used by A2DP to provide the sound data
-int32_t get_sound_data(Frame* frames, int32_t count) {
+int32_t get_sound_data(Frame* frames, int32_t frameCount) {
     uint8_t *data = (uint8_t*)frames;
-    int channels = 2;
+    int frameSize = 4;
     size_t len = count * channels * sizeof(int16_t);
-   // the ADC provides data in 16 bits
-    size_t result_len = adc.readBytes(data, len);   
-    scaler.convert(data, result_len);
-    return result_len;
+    size_t resultBytes = adc.readBytes(data, frameCount*frameSize);   
+    scaler.convert(data, resultBytes);
+    return resultBytes/frameSize;
 }
 
 // Arduino Setup
@@ -42,6 +41,7 @@ void setup(void) {
 
   // start the bluetooth
   Serial.println("starting A2DP...");
+  a2dp_source.set_auto_reconnect(false); 
   a2dp_source.start("MyMusic", get_sound_data);  
 }
 

examples/examples-basic-api/base-i2s-a2dp/base-i2s-a2dp.ino

@@ -49,6 +49,7 @@ void setup(void) {
 
   // start the bluetooth
   Serial.println("starting A2DP...");
+  a2dp_source.set_auto_reconnect(false);
   a2dp_source.start("LEXON MINO L", get_sound_data);  
 }
 

examples/examples-basic-api/base-file_mp3-a2dp/base-file_mp3-a2dp.ino renamed to examples/sandbox/base-file_mp3-a2dp/base-file_mp3-a2dp.ino

@@ -15,44 +15,41 @@
 
 BluetoothA2DPSink a2dp_sink;
 VS1053Stream out; // final output
-bool active = false;
-// Write data to SPDIF in callback
-void read_data_stream(const uint8_t *data, uint32_t length) {
-  if (active) out.write(data, length);
+VS1053Config cfg;
+CallbackBufferedStream<uint8_t> buffer(1024,10);
+StreamCopy copier(out, buffer); // copies sound into i2s
+
+// Write data from A2DP to buffer
+void read_data_stream(const uint8_t *data, uint32_t frames) {
+  int frameSize = 4;
+  buffer.write(data, frames*frameSize);
 }
 
+
 // for esp_a2d_audio_state_t see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/bluetooth/esp_a2dp.html#_CPPv421esp_a2d_audio_state_t
 void audio_state_changed(esp_a2d_audio_state_t state, void *ptr){
   Serial.println(a2dp_sink.to_str(state));
     switch(state){
       case ESP_A2D_AUDIO_STATE_STARTED:
-        out.begin();
-        active = true;
+        buffer.begin();
+        out.begin(cfg);
         break;
       case ESP_A2D_AUDIO_STATE_STOPPED:
       case ESP_A2D_AUDIO_STATE_REMOTE_SUSPEND:
-        active = false;
         out.end();
+        buffer.end();
+        buffer.clear();
         break;
     }
 }
 
-
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
-  // register callbacks
-  a2dp_sink.set_stream_reader(read_data_stream, false);
-  a2dp_sink.set_on_audio_state_changed(audio_state_changed);
-
-  // Start Bluetooth Audio Receiver
-  a2dp_sink.set_auto_reconnect(false);
-  a2dp_sink.start("a2dp-vs1053");
-
   // setup VS1053
-  auto cfg = out.defaultConfig();
-  cfg.sample_rate = a2dp_sink.sample_rate();
+  cfg = out.defaultConfig();
+  cfg.sample_rate = 44100;
   cfg.channels = 2;
   cfg.bits_per_sample = 16;
   // Use your custom pins or define in AudioCodnfig.h
@@ -61,8 +58,16 @@ void setup() {
   //cfg.dreq_pin = VS1053_DREQ;
   //cfg.reset_pin = VS1053_RESET;
 
-  out.begin(cfg);
-  out.end();
+  // register callbacks
+  a2dp_sink.set_stream_reader(read_data_stream, false);
+  a2dp_sink.set_on_audio_state_changed(audio_state_changed);
+  // Start Bluetooth Audio Receiver
+  a2dp_sink.set_auto_reconnect(false);
+  a2dp_sink.start("a2dp-vs1053");
+
+
 }
 
-void loop() { delay(1000); }
+void loop() { 
+  if (buffer) copier.copy();
+}

examples/sandbox/basic-a2dp-vs1053/basic-a2dp-vs1053.ino

@@ -815,6 +815,18 @@ class CallbackBufferedStream : public AudioStreamX {
     ;
   }
 
+  /// Clears the data in the buffer
+  void clear() {
+    if (active){
+      callback_buffer_ptr->reset();
+    }
+  }
+
+  /// Returns true if active
+  operator bool(){
+    return active;
+  }
+
  protected:
   NBuffer<T> *callback_buffer_ptr;
   bool active;