Add double-buffer input file source

AudioFileSourceBuffer allows system RAM to be used to buffer an
input file (normally just a HTTP Stream) to help avoid hiccups.
This could also be subclassed to use an external SRAM, at some
soint.
This commit is contained in:
Earle F. Philhower, III committed 2017-11-14 07:08:45 -08:00
1 parent f61fcb80f8
commit c669a329c4
6 files changed
+208 -2

No files matched your search

+1
View File
@@ -4,6 +4,7 @@ AudioFileSourceFastROMFS KEYWORD1
AudioFileSourcePROGMEM KEYWORD1
AudioFileSourceHTTPStream KEYWORD1
AudioFileSourceSD KEYWORD1
AudioFileSourceBuffer KEYWORD1
AudioGenerator KEYWORD1
AudioGeneratorFLAC KEYWORD1
AudioGeneratorMOD KEYWORD1
+1
View File
@@ -30,6 +30,7 @@ class AudioFileSource
virtual ~AudioFileSource() {};
virtual bool open(const char *filename) { (void)filename; return false; };
virtual uint32_t read(void *data, uint32_t len) { (void)data; (void)len; return 0; };
virtual uint32_t readNonBlock(void *data, uint32_t len) { return read(data, len); };
virtual bool seek(int32_t pos, int dir) { (void)pos; (void)dir; return false; };
virtual bool close() { return false; };
virtual bool isOpen() { return false; };
+138
View File
@@ -0,0 +1,138 @@
/*
AudioFileSourceBuffer
Double-buffered file source using system RAM
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 <Arduino.h>
#include "AudioFileSourceBuffer.h"
AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, int buffSizeBytes)
{
buffSize = buffSizeBytes;
buffer = (uint8_t*)malloc(sizeof(uint8_t) * buffSize);
writePtr = 0;
readPtr = 0;
src = source;
length = 0;
filled = false;
}
AudioFileSourceBuffer::~AudioFileSourceBuffer()
{
free(buffer);
buffer = NULL;
}
bool AudioFileSourceBuffer::seek(int32_t pos, int dir)
{
// Invalidate
readPtr = 0;
writePtr = 0;
length = 0;
return src->seek(pos, dir);
}
bool AudioFileSourceBuffer::close()
{
free(buffer);
buffer = NULL;
return src->close();
}
bool AudioFileSourceBuffer::isOpen()
{
return src->isOpen();
}
uint32_t AudioFileSourceBuffer::getSize()
{
return src->getSize();
}
uint32_t AudioFileSourceBuffer::getPos()
{
return src->getPos();
}
uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len)
{
if (!buffer) return src->read(data, len);
uint32_t bytes = 0;
if (!filled) {
// Fill up completely before returning any data at all
length = src->read(buffer, buffSize);
writePtr = length % buffSize;
filled = true;
}
// Naively pull from buffer until we've got none left or we've satisfied the request
uint8_t *ptr = reinterpret_cast<uint8_t*>(data);
while (len && length) {
*ptr = buffer[readPtr];
ptr++;
readPtr = (readPtr+1) % buffSize;
len--;
bytes++;
length--;
}
// Serial.printf("read %d from buffer, %d avail in buff, %d remaining for request\n", bytes, length, len);
if (len) {
// Still need more, try direct read from src
bytes += src->read(ptr, len);
}
if (length < buffSize) {
// Now try and opportunistically fill the buffer
if (readPtr > writePtr) {
int bytesAvailMid = readPtr - writePtr - 1;
if (bytesAvailMid > 0) {
//Serial.print("at mid: ");
int cnt = src->readNonBlock(&buffer[writePtr], bytesAvailMid);
//Serial.printf("read %d\n", cnt);
length += cnt;
writePtr = (writePtr + cnt) % buffSize;
}
return bytes;
}
int bytesAvailEnd = buffSize - writePtr;
if (bytesAvailEnd > 0) {
//Serial.print("at end: ");
int cnt = src->readNonBlock(&buffer[writePtr], bytesAvailEnd);
//Serial.printf("read %d\n", cnt);
length += cnt;
writePtr = (writePtr + cnt) % buffSize;
if (cnt != bytesAvailEnd) return bytes;
}
int bytesAvailStart = readPtr - 1;
if (bytesAvailStart > 0) {
//Serial.print("at begin: ");
int cnt = src->readNonBlock(&buffer[writePtr], bytesAvailStart);
//Serial.printf("read %d\n", cnt);
length += cnt;
writePtr = (writePtr + cnt) % buffSize;
}
}
return bytes;
}
+52
View File
@@ -0,0 +1,52 @@
/*
AudioFileSourceBuffer
Double-buffered input file using system RAM
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 _AUDIOFILESOURCEBUFFER_H
#define _AUDIOFILESOURCEBUFFER_H
#include "AudioFileSource.h"
class AudioFileSourceBuffer : public AudioFileSource
{
public:
AudioFileSourceBuffer(AudioFileSource *in, int bufferBytes);
virtual ~AudioFileSourceBuffer() override;
virtual uint32_t read(void *data, uint32_t len) override;
virtual bool seek(int32_t pos, int dir) override;
virtual bool close() override;
virtual bool isOpen() override;
virtual uint32_t getSize() override;
virtual uint32_t getPos() override;
private:
AudioFileSource *src;
int buffSize;
uint8_t *buffer;
int writePtr;
int readPtr;
int length;
bool filled;
};
#endif
+14 -2
View File
@@ -50,6 +50,16 @@ AudioFileSourceHTTPStream::~AudioFileSourceHTTPStream()
}
uint32_t AudioFileSourceHTTPStream::read(void *data, uint32_t len)
{
return readInternal(data, len, false);
}
uint32_t AudioFileSourceHTTPStream::readNonBlock(void *data, uint32_t len)
{
return readInternal(data, len, true);
}
uint32_t AudioFileSourceHTTPStream::readInternal(void *data, uint32_t len, bool nonBlock)
{
if (!http.connected()) return 0;
if ((size>0) && (pos >= size)) return 0;
@@ -59,8 +69,10 @@ uint32_t AudioFileSourceHTTPStream::read(void *data, uint32_t len)
// Can't read past EOF...
if ( (size > 0) && (len > (uint32_t)(pos - size)) ) len = pos - size;
int start = millis();
while ((stream->available() < (int)len) && (millis() - start < 500)) yield();
if (!nonBlock) {
int start = millis();
while ((stream->available() < (int)len) && (millis() - start < 500)) yield();
}
size_t avail = stream->available();
if (!avail) return 0;
+2
View File
@@ -35,6 +35,7 @@ class AudioFileSourceHTTPStream : public AudioFileSource
virtual bool open(const char *url) override;
virtual uint32_t read(void *data, uint32_t len) override;
virtual uint32_t readNonBlock(void *data, uint32_t len) override;
virtual bool seek(int32_t pos, int dir) override;
virtual bool close() override;
virtual bool isOpen() override;
@@ -42,6 +43,7 @@ class AudioFileSourceHTTPStream : public AudioFileSource
virtual uint32_t getPos() override;
private:
uint32_t readInternal(void *data, uint32_t len, bool nonBlock);
HTTPClient http;
int pos;
int size;