mp3 support

Author: pschatzmann

README.md

@@ -17,10 +17,10 @@ We also provide plenty of examples that demonstrate how to implement the differe
 
 ## Optional Libraries
 
-- SD Library
-- A2DP Library
-- arduino-fdk-aac
-- ESP8266Audio
+- [ESP32-A2DP Library](https://github.com/pschatzmann/ESP32-A2DP)
+- [arduino-fdk-aac](https://github.com/pschatzmann/arduino-fdk-aac)
+- [ESP8266Audio](https://github.com/earlephilhower/ESP8266Audio)
+- [SD Library](https://www.arduino.cc/en/reference/SD)
 
 ## Examples
 
@@ -49,7 +49,7 @@ This is currently work in progress:
 |------------------------|---------|
 | Analog input - ADC     | tested  |
 | I2S                    | tested  |
-| Files                  | tested    |
+| Files (RAW, MP3...)    | tested  |
 | Streams                | open    |
 | WAV encoding/deconding | open    |          
 | AAC encoding/deconding | open    |          

examples/file_mp3-a2dp/README.md

@@ -0,0 +1,5 @@
+# Using ESP8266Audio to Read Files 
+
+The processing of files with the help of the [ESP8266Audio](https://github.com/earlephilhower/ESP8266Audio) is a little bit more involved. Howver it allows to process different file types from different sources. Please consult the project for further details.
+
+In this Sketch we use the ESP8266Audio library to read the [audio.mp3](https://pschatzmann.github.io/arduino-sound-tools/resources/audio.mp3) file from a SD drive. The output is pushed into a temporary buffer. The A2DP Callback then just consumes this buffered data... 

examples/file_mp3-a2dp/file_mp3-a2dp.ino

@@ -0,0 +1,73 @@
+#include <SPI.h>
+#include <SD.h>
+#include "AudioFileSourceSPIFFS.h"
+#include "AudioFileSourceID3.h"
+#include "AudioGeneratorMP3.h"
+#include "AudioOutputWithCallback.h"
+#include "BluetoothA2DPSource.h"
+#include "SoundTools.h"
+
+using namespace sound_tools;  
+
+const int sd_ss_pin = 5;
+String fileName = "";
+BluetoothA2DPSource a2dp_source;
+AudioFileSourceSPIFFS *file;
+AudioFileSourceID3 *id3;
+AudioGeneratorMP3 *mp3;
+AudioOutputWithCallback *out;
+
+// callback used by A2DP to provide the sound data
+int32_t get_sound_data(Channels* data, int32_t len) {
+  return out.read(data, len);
+}
+
+// finds a mp3 file
+bool findMp3File() {
+  File dir, root = SPIFFS.open("/");  
+  while ((dir = root.openNextFile())) {
+    if (String(dir.name()).endsWith(".mp3")) {
+      if (file->open(dir.name())) {
+        fileName = String(dir.name());
+        break;
+      }
+    }
+    dir = root.openNextFile();
+  }
+  return fileName.length() > 0;
+}
+
+// Arduino Setup
+void setup(void) {
+  Serial.begin(115200);
+  audioLogger = &Serial;
+
+  // start the bluetooth
+  Serial.println("starting A2DP...");
+  a2dp_source.start("MyMusic", get_sound_data);  
+
+  // Setup Audio
+  SPIFFS.begin(sd_ss_pin);
+  file = new AudioFileSourceSPIFFS(); 
+  mp3 = new AudioGeneratorMP3();
+  out = new AudioOutputWithCallback(1024,5);
+  
+  // Find first MP3 file in SPIFF and play it
+  if (findMp3File()) {
+    id3 = new AudioFileSourceID3(file);
+    mp3->begin(id3, out);
+    Serial.printf("Playback of '%s' begins...\n", fileName.c_str());
+  } else {
+    Serial.println("Can't find .mp3 file in SPIFFS");
+  }
+}
+
+// Arduino loop - repeated processing 
+void loop() {
+  if (mp3->isRunning()) {
+    if (!mp3->loop()) mp3->stop();
+  } else {
+    Serial.println("MP3 done");
+    delay(1000);
+  }
+}

src/AudioOutputWithCallback.h

@@ -0,0 +1,54 @@
+
+#pragma once
+
+#include "AudioOutput.h"
+#include "SoundData.h"
+#include "SoundTools.h"
+
+namespace sound_tools {
+
+/**
+ * @brief ESP8266Audio AudioOutput class which stores the data in a temporary buffer. 
+ * The buffer can be consumed e.g. by a callback function by calling read();
+ */
+class AudioOutputWithCallback : public AudioOutput
+{
+  public:
+    AudioOutputWithCallback(int bufferSize, int bufferCount ){
+        buffer_ptr = new NBuffer<Channels>(bufferSize, bufferCount);
+    }
+
+    virtual ~AudioOutputWithCallback() {    
+        delete buffer_ptr;
+    }
+
+    virtual bool begin() { 
+        active = true;
+        return true;
+    }
+
+    /// puts the sample into a buffer
+    virtual bool ConsumeSample(int16_t sample[2]) {
+        Channels c;
+        c.channel1 = sample[0];
+        c.channel2 = sample[1];
+        return buffer_ptr->write(c);
+    };
+
+    /// stops the processing
+    virtual bool stop() {
+        active = false;
+        return true;
+    };
+
+    /// Provides the data from the internal buffer to the callback
+    size_t read(Channels *src, size_t len){
+        return active ? this->buffer_ptr->readArray(src, len) : 0;
+    }
+    
+  protected:
+    NBuffer<Channels> *buffer_ptr;
+    bool active;
+};
+
+}

src/SoundTools.h

@@ -14,4 +14,5 @@
 #include "SoundTools/SoundGenerator.h"
 #include "SoundTools/I2S.h"
 #include "SoundTools/ADC.h"
+#include "SoundTools/AudioLogger.h"
 #include "SoundTools/Buffers.h"

src/SoundTools/AudioLogger.h

@@ -6,7 +6,11 @@
 #define SOUND_LOG_LEVEL Error
 #endif
 
-namespace pico_arduino {
+#ifndef PRINTF_BUFFER_SIZE
+#define PRINTF_BUFFER_SIZE 160
+#endif
+
+namespace sound_tools {
 
 /**
  * @brief A simple Logger that writes messages dependent on the log level
@@ -101,6 +105,6 @@ class SoundLogger {
 
 };
 
-inline SoundLogger Logger;
+SoundLogger Logger;
 
 }    

src/SoundTools/Buffers.h

@@ -221,7 +221,7 @@ class NBuffer : public BaseBuffer<T> {
               actual_write_buffer = getNextAvailableBuffer();
           }
       } else {
-          Serial.println("actual_write_buffer is full");
+          //Logger.debug("actual_write_buffer is full");
       }
 
       if (start_time==0l){
@@ -290,14 +290,14 @@ class NBuffer : public BaseBuffer<T> {
 
 
 protected:
-    uint16_t buffer_count;
-    uint16_t write_buffer_count;
-    BaseBuffer<T> *actual_read_buffer;
-    BaseBuffer<T> *actual_write_buffer;
-    BaseBuffer<T> **avaliable_buffers;
-    BaseBuffer<T> **filled_buffers;
-    unsigned long start_time;
-    unsigned long sample_count;
+    uint16_t buffer_count = 0;
+    uint16_t write_buffer_count = 0;
+    BaseBuffer<T> *actual_read_buffer = nullptr;
+    BaseBuffer<T> *actual_write_buffer = nullptr;
+    BaseBuffer<T> **avaliable_buffers = nullptr;
+    BaseBuffer<T> **filled_buffers = nullptr;
+    unsigned long start_time = 0;
+    unsigned long sample_count = 0;
 
 
     BaseBuffer<T> *getNextAvailableBuffer() {

src/SoundTools/SoundTypes.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <bits/stdc++.h>
 
 namespace sound_tools {