Merge pull request #27 from toniebox-reverse-engineering/develop

Develop for Nightly 20220427

.gitignore

@@ -1,2 +1,3 @@
 ConfigStatic.h
 .vscode/*
+build/out/*

AudioCustomLogger.h

@@ -18,6 +18,7 @@ class AudioCustomLogger: public DevNullOut
         va_list args;
 	    va_start(args, msg);
 	    Log.printFormat(msg, args);
+        return 0; //TOOD?
     };
 };
 

AudioGeneratorWAVStatic.cpp

@@ -0,0 +1,297 @@
+/*
+  AudioGeneratorWAVStatic
+  Audio output generator that reads 8 and 16-bit WAV files
+  
+  Copyright (C) 2017  Earle F. Philhower, III
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "AudioGeneratorWAVStatic.h"
+
+
+AudioGeneratorWAVStatic::~AudioGeneratorWAVStatic(){}
+
+bool AudioGeneratorWAVStatic::stop()
+{
+  if (!running) return true;
+  running = false;
+  output->stop();
+  return file->close();
+}
+
+bool AudioGeneratorWAVStatic::isRunning()
+{
+  return running;
+}
+
+
+// Handle buffered reading, reload each time we run out of data
+bool AudioGeneratorWAVStatic::GetBufferedData(int bytes, void *dest)
+{
+  if (!running) return false; // Nothing to do here!
+  uint8_t *p = reinterpret_cast<uint8_t*>(dest);
+  while (bytes--) {
+    // Potentially load next batch of data...
+    if (buffPtr >= buffLen) {
+      buffPtr = 0;
+      uint32_t toRead = availBytes > BUFFER_SIZE ? BUFFER_SIZE : availBytes;
+      buffLen = file->read( buff, toRead );
+      availBytes -= buffLen;
+    }
+    if (buffPtr >= buffLen)
+      return false; // No data left!
+    *(p++) = buff[buffPtr++];
+  }
+  return true;
+}
+
+bool AudioGeneratorWAVStatic::loop()
+{
+  if (!running) goto done; // Nothing to do here!
+
+  // First, try and push in the stored sample.  If we can't, then punt and try later
+  if (!output->ConsumeSample(lastSample)) goto done; // Can't send, but no error detected
+
+  // Try and stuff the buffer one sample at a time
+  do
+  {
+    if (bitsPerSample == 8) {
+      uint8_t l, r;
+      if (!GetBufferedData(1, &l)) stop();
+      if (channels == 2) {
+        if (!GetBufferedData(1, &r)) stop();
+      } else {
+        r = 0;
+      }
+      lastSample[AudioOutput::LEFTCHANNEL] = l;
+      lastSample[AudioOutput::RIGHTCHANNEL] = r;
+    } else if (bitsPerSample == 16) {
+      if (!GetBufferedData(2, &lastSample[AudioOutput::LEFTCHANNEL])) stop();
+      if (channels == 2) {
+        if (!GetBufferedData(2, &lastSample[AudioOutput::RIGHTCHANNEL])) stop();
+      } else {
+        lastSample[AudioOutput::RIGHTCHANNEL] = 0;
+      }
+    }
+  } while (running && output->ConsumeSample(lastSample));
+
+done:
+  file->loop();
+  output->loop();
+
+  return running;
+}
+
+
+bool AudioGeneratorWAVStatic::ReadWAVInfo()
+{
+  uint32_t u32;
+  uint16_t u16;
+  int toSkip;
+
+  // WAV specification document:
+  // https://www.aelius.com/njh/wavemetatools/doc/riffmci.pdf
+
+  // Header == "RIFF"
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (u32 != 0x46464952) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, invalid RIFF header, got: %08X \n"), (uint32_t) u32);
+    return false;
+  }
+
+  // Skip ChunkSize
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+
+  // Format == "WAVE"
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (u32 != 0x45564157) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, invalid WAVE header, got: %08X \n"), (uint32_t) u32);
+    return false;
+  }
+
+  // there might be JUNK or PAD - ignore it by continuing reading until we get to "fmt "
+  while (1) {
+    if (!ReadU32(&u32)) {
+      audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+      return false;
+    };
+    if (u32 == 0x20746d66) break; // 'fmt '
+  };
+
+  // subchunk size
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (u32 == 16) { toSkip = 0; }
+  else if (u32 == 18) { toSkip = 18 - 16; }
+  else if (u32 == 40) { toSkip = 40 - 16; }
+  else {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, appears not to be standard PCM \n"));
+    return false;
+  } // we only do standard PCM
+
+  // AudioFormat
+  if (!ReadU16(&u16)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (u16 != 1) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, AudioFormat appears not to be standard PCM \n"));
+    return false;
+  } // we only do standard PCM
+
+  // NumChannels
+  if (!ReadU16(&channels)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if ((channels<1) || (channels>2)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, only mono and stereo are supported \n"));
+    return false;
+  } // Mono or stereo support only
+
+  // SampleRate
+  if (!ReadU32(&sampleRate)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (sampleRate < 1) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, unknown sample rate \n"));
+    return false;
+  }  // Weird rate, punt.  Will need to check w/DAC to see if supported
+
+  // Ignore byterate and blockalign
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if (!ReadU16(&u16)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+
+  // Bits per sample
+  if (!ReadU16(&bitsPerSample)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  if ((bitsPerSample!=8) && (bitsPerSample != 16)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, only 8 or 16 bits is supported \n"));
+    return false;
+  }  // Only 8 or 16 bits
+
+  // Skip any extra header
+  while (toSkip) {
+    uint8_t ign;
+    if (!ReadU8(&ign)) {
+      audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+      return false;
+    };
+    toSkip--;
+  }
+
+  // look for data subchunk
+  do {
+    // id == "data"
+    if (!ReadU32(&u32)) {
+      audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+      return false;
+    };
+    if (u32 == 0x61746164) break; // "data"
+    // Skip size, read until end of chunk
+    if (!ReadU32(&u32)) {
+      audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+      return false;
+    };
+    if(!file->seek(u32, SEEK_CUR)) {
+      audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data, seek failed\n"));
+      return false;
+    }
+  } while (1);
+  if (!file->isOpen()) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: cannot read WAV, file is not open\n"));
+    return false;
+  };
+
+  // Skip size, read until end of file...
+  if (!ReadU32(&u32)) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::ReadWAVInfo: failed to read WAV data\n"));
+    return false;
+  };
+  availBytes = u32;
+
+  buffPtr = 0;
+  buffLen = 0;
+
+  return true;
+}
+
+bool AudioGeneratorWAVStatic::begin(AudioFileSource *source, AudioOutput *output) {
+  running = false;
+  buffPtr = 0;
+  buffLen = 0;
+
+  if (!source) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: failed: invalid source\n"));
+    return false;
+  }
+  file = source;
+  if (!output) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: invalid output\n"));
+    return false;
+  }
+  this->output = output;
+  if (!file->isOpen()) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: file not open\n"));
+    return false;
+  } // Error
+
+  if (!ReadWAVInfo()) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: failed during ReadWAVInfo\n"));
+    return false;
+  }
+
+  if (!output->SetRate( sampleRate )) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: failed to SetRate in output\n"));
+    return false;
+  }
+  if (!output->SetBitsPerSample( bitsPerSample )) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: failed to SetBitsPerSample in output\n"));
+    return false;
+  }
+  if (!output->SetChannels( channels )) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: failed to SetChannels in output\n"));
+    return false;
+  }
+  if (!output->begin()) {
+    audioLogger->printf_P(PSTR("AudioGeneratorWAVStatic::begin: output's begin did not return true\n"));
+    return false;
+  }
+
+  running = true;
+
+  return true;
+}

AudioGeneratorWAVStatic.h

@@ -0,0 +1,62 @@
+/*
+  AudioGeneratorWAV
+  Audio output generator that reads 8 and 16-bit WAV files
+    
+  Copyright (C) 2017  Earle F. Philhower, III
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _AUDIOGENERATORWAVSTATIC_H
+#define _AUDIOGENERATORWAVSTATIC_H
+
+#include "AudioGenerator.h"
+
+class AudioGeneratorWAVStatic : public AudioGenerator
+{
+  public:
+    virtual ~AudioGeneratorWAVStatic() override;
+    virtual bool begin(AudioFileSource *source, AudioOutput *output) override;
+    virtual bool loop() override;
+    virtual bool stop() override;
+    virtual bool isRunning() override;
+
+  private:
+    bool ReadU32(uint32_t *dest) { return file->read(reinterpret_cast<uint8_t*>(dest), 4); }
+    bool ReadU16(uint16_t *dest) { return file->read(reinterpret_cast<uint8_t*>(dest), 2); }
+    bool ReadU8(uint8_t *dest) { return file->read(reinterpret_cast<uint8_t*>(dest), 1); }
+    bool GetBufferedData(int bytes, void *dest);
+    bool ReadWAVInfo();
+
+
+  protected:
+    // WAV info
+    uint16_t channels;
+    uint32_t sampleRate;
+    uint16_t bitsPerSample;
+
+    uint32_t availBytes;
+
+    // We need to buffer some data in-RAM to avoid doing 1000s of small reads
+    //uint32_t buffSize;
+    //uint8_t *buff;
+    uint16_t buffPtr;
+    uint16_t buffLen;
+
+    static const uint16_t BUFFER_SIZE = 256;
+    uint8_t buff[BUFFER_SIZE];
+};
+
+#endif
+

AudioOutputCC3200I2S.cpp

@@ -113,6 +113,7 @@ void AudioOutputCC3200I2S::flush() {
 
 bool AudioOutputCC3200I2S::stop() {
   flush();
+  return true;
 }
 bool AudioOutputCC3200I2S::begin() {
   return true;