From 8a19c9c093f04ff9cc02be6434f20624712b952b Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Mon, 20 Nov 2017 06:57:59 -0800 Subject: [PATCH] Fix buffering losing bytes Correct issue @armSeb found and fixed where some bytes on the fallthrough case were not being recorded as stored, leading to mp3 playback errors. Fixes one half of issue 7. --- src/AudioFileSourceBuffer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/AudioFileSourceBuffer.cpp b/src/AudioFileSourceBuffer.cpp index 0cdeae1..52b57c3 100644 --- a/src/AudioFileSourceBuffer.cpp +++ b/src/AudioFileSourceBuffer.cpp @@ -94,9 +94,9 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len) readPtr = (readPtr + toReadToEnd) % buffSize; len -= toReadToEnd; length -= toReadToEnd; - toReadFromBuffer -= toReadToEnd; ptr += toReadToEnd; bytes += toReadToEnd; + toReadFromBuffer -= toReadToEnd; } if (toReadFromBuffer > 0) { // We know RP < WP at this point // Serial.printf("readhead: toReadFromBuffer=%d, rp=%d, wp=%d\n", toReadFromBuffer, readPtr, writePtr); @@ -104,9 +104,9 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len) readPtr = (readPtr + toReadFromBuffer) % buffSize; len -= toReadFromBuffer; length -= toReadFromBuffer; - toReadFromBuffer -= toReadFromBuffer; ptr += toReadFromBuffer; bytes += toReadFromBuffer; + toReadFromBuffer -= toReadFromBuffer; } // Serial.printf("read %d from buffer, %d avail in buff, %d remaining for request\n", bytes, length, len); @@ -129,8 +129,6 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len) return bytes; } - - int bytesAvailEnd = buffSize - writePtr; if (bytesAvailEnd > 0) { //Serial.print("at end: ");