A2DP optimizations

Author: pschatzmann

examples/examples-player/player-callback-i2s/player-callback-i2s.ino

@@ -24,7 +24,7 @@ Stream* callbackStream();
 
 
 // data
-const int chipSelect=5;
+const int chipSelect=PIN_CS;
 AudioSourceCallback source(callbackStream,callbackInit);
 I2SStream i2s;
 MP3DecoderHelix decoder;

examples/examples-player/player-sd-a2dp/README.md

@@ -0,0 +1,28 @@
+# A Simple SdFat Audio Player
+
+The example demonstrates how to implement an __MP3 Player__: which provides the data from a SD drive and provides the audio via A2DP (e.g. to a Bluetooth Speaker): The __AudioSourceSdFat class__ builds on the [SdFat Library](https://github.com/greiman/SdFat) from Bill Greiman which provides FAT16/FAT32 and exFAT support. 
+
+## SD Card
+
+Here is the information how to wire the SD card to the ESP32
+
+| SD    | ESP32 
+|-------|-----------------------
+| CS    | VSPI-CS0 (GPIO 05) 
+| SCK   | VSPI-CLK (GPIO 18) 
+| MOSI  | VSPI-MOSI (GPIO 23) 
+| MISO  | VSPI-MISO (GPIO 19) 
+| VCC   | VIN (5V) 
+| GND   | GND 
+
+![SD](https://www.pschatzmann.ch/wp-content/uploads/2021/04/sd-module.jpeg)
+
+
+
+
+## Dependencies
+
+- https://github.com/pschatzmann/arduino-audio-tools
+- https://github.com/pschatzmann/arduino-libhelix
+- https://github.com/greiman/SdFat
+- https://github.com/pschatzmann/ESP32-A2DP

examples/sandbox/player-sd-a2dp.ino renamed to examples/examples-player/player-sd-a2dp/player-sd-a2dp.ino

@@ -12,21 +12,24 @@ using namespace audio_tools;
 const char *startFilePath="/";
 const char* ext="mp3";
 AudioSourceSdFat source(startFilePath, ext);
-A2DPStream out = A2DPStream::instance() ;                 // A2DP input - A2DPStream is a singleton!
+A2DPStream out = A2DPStream::instance();  // A2DP input - A2DPStream is a singleton!
 MP3DecoderHelix decoder;
 AudioPlayer player(source, out, decoder);
 
 
 void setup() {
   Serial.begin(115200);
-  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
-  // setup output - We send the test signal via A2DP - so we conect to the MyMusic Bluetooth Speaker
-  out.begin(TX_MODE, "MyMusic");
+  // setup output - We send the test signal via A2DP - so we conect to the "LEXON MINO L" Bluetooth Speaker
+  auto cfg = out.defaultConfig(TX_MODE);
+  cfg.name = "LEXON MINO L";
+  out.begin(cfg);
 
   // setup player
-  player.setVolume(0.5);
+  player.setVolume(0.1);
   player.begin();
+
 }
 
 void loop() {

examples/streams-sd_mp3-i2s/streams-sd_mp3-i2s.ino

@@ -22,15 +22,15 @@ const int chipSelect=10;
 I2SStream i2s; // final output of decoded stream
 EncodedAudioStream decoder(&i2s, new MP3DecoderHelix()); // Decoding stream
 StreamCopy copier; 
-
+File audioFile;
 
 void setup(){
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);  
 
   // setup file
   SD.begin(chipSelect);
-  File audioFile = SD.open("/music.mp3");
+  audioFile = SD.open("/Music/Conquistadores.mp3");
 
   // setup i2s
   auto config = i2s.defaultConfig(TX_MODE);

examples/tests/test-player/test-player.ino

@@ -0,0 +1,58 @@
+#define USE_SDFAT
+
+#include <SPI.h>
+#include <SD.h>
+#include "AudioTools.h"
+
+using namespace audio_tools;  
+
+const char *urls[] = {
+  "http://centralcharts.ice.infomaniak.ch/centralcharts-128.mp3",
+  "http://centraljazz.ice.infomaniak.ch/centraljazz-128.mp3",
+  "http://centralrock.ice.infomaniak.ch/centralrock-128.mp3",
+  "http://centralcountry.ice.infomaniak.ch/centralcountry-128.mp3",
+  "http://centralfunk.ice.infomaniak.ch/centralfunk-128.mp3"
+};
+
+URLStream urlStream("SSID","password");
+AudioSourceURL source(urlStream, urls, "audio/mp3");
+
+
+void testUrl(){
+    for (int j=-10;j<10;j++){
+        Stream *out = source.setIndex(j);
+        Serial.printf("%d -> %d / %s \n", j, source.index(), source.toStr());
+        if (out!=nullptr){
+          delay(500);
+          assert(out->available()>0);
+        }
+    }
+    Serial.println("--------------------------");
+}
+
+const char *startFilePath="/";
+const char* ext="mp3";
+AudioSourceSdFat sdsource(startFilePath, ext);
+
+void testSD() {
+    for (int j=-5;j<20;j++){
+        Stream *out = sdsource.setIndex(j);
+        Serial.printf("%d -> %d / %s \n", j, sdsource.index(), sdsource.toStr());
+        if (out!=nullptr){
+          assert(out->available()>0);
+        }
+    }
+    Serial.println("--------------------------");
+
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Error);  
+  testUrl();
+  testSD();
+}
+
+void loop(){
+
+}