Audio patches for 3.20

Author: realA10001986

timecircuits-A10001986/src/ESP8266Audio/AudioGeneratorWAV.cpp

@@ -39,16 +39,14 @@ AudioGeneratorWAV::AudioGeneratorWAV()
 
 AudioGeneratorWAV::~AudioGeneratorWAV()
 {
-  free(buff);
-  buff = NULL;
+  freeBuf();
 }
 
 bool AudioGeneratorWAV::stop()
 {
   if (!running) return true;
   running = false;
-  free(buff);
-  buff = NULL;
+  freeBuf();
   output->stop();
   return file->close();
 }
@@ -58,6 +56,12 @@ bool AudioGeneratorWAV::isRunning()
   return running;
 }
 
+bool AudioGeneratorWAV::freeBuf()
+{
+    if(buff) free(buff);
+    buff = NULL;
+    return false;
+}
 
 // Handle buffered reading, reload each time we run out of data
 bool AudioGeneratorWAV::GetBufferedData16x2(int16_t& destL, int16_t& destR)
@@ -154,12 +158,12 @@ bool AudioGeneratorWAV::loop()
       uint8_t l, r = 0;
       do
       {
-          if (!GetBufferedData8(l)) stop();
-          if (channels == 2) {
-              if (!GetBufferedData8(r)) stop();
+          if(!GetBufferedData8(l)) stop();
+          sL = ((int16_t)l - 128) << 8;
+          if(channels == 2) {
+              if(!GetBufferedData8(r)) stop();
+              sR = ((int16_t)r - 128) << 8;
           }
-          sL = l;
-          sR = r;
       } while (running && output->ConsumeSample(sL, sR));
   }
 
@@ -356,19 +360,20 @@ bool AudioGeneratorWAV::begin(AudioFileSource *source, AudioOutput *output)
 
   if (!output->SetRate( sampleRate )) {
     DBG(PSTR("AudioGeneratorWAV::begin: failed to SetRate in output\n"));
-    return false;
+    return freeBuf();
   }
-  if (!output->SetBitsPerSample( bitsPerSample )) {
+  // Output is always 16bit
+  if (!output->SetBitsPerSample(16)) {
     DBG(PSTR("AudioGeneratorWAV::begin: failed to SetBitsPerSample in output\n"));
-    return false;
+    return freeBuf();
   }
   if (!output->SetChannels( channels )) {
     DBG(PSTR("AudioGeneratorWAV::begin: failed to SetChannels in output\n"));
-    return false;
+    return freeBuf();
   }
   if (!output->begin()) {
     DBG(PSTR("AudioGeneratorWAV::begin: output's begin did not return true\n"));
-    return false;
+    return freeBuf();
   }
 
   running = true;

timecircuits-A10001986/src/ESP8266Audio/AudioGeneratorWAV.h

@@ -48,6 +48,8 @@ class AudioGeneratorWAV : public AudioGenerator
 
 
   protected:
+    bool freeBuf();
+
     // WAV info
     uint16_t channels;
     uint32_t sampleRate;