Skip to content

Commit 99b8158

Browse files
Fixes to _playFromRingBuffer()
1 parent 1752da5 commit 99b8158

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/ESP32_VS1053_Stream.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -397,40 +397,40 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
397397

398398
const auto START_TIME_MS = millis();
399399
const auto MAX_TIME_MS = 5;
400-
size_t bytesToDecoder = 0;
400+
//size_t bytesToDecoder = 0;
401401
while (_remainingBytes && _vs1053->data_request() && millis() - START_TIME_MS < MAX_TIME_MS)
402402
{
403403
size_t size = 0;
404404
uint8_t *data = (uint8_t *)xRingbufferReceiveUpTo(_ringbuffer_handle, &size, pdMS_TO_TICKS(0), VS1053_PLAYBUFFER_SIZE);
405-
static auto bufferEmptyStartTimeMs = 0;
405+
static auto emptyBufferStartTimeMs = 0;
406406
if (!data)
407407
{
408-
if (!bufferEmptyStartTimeMs)
408+
if (!emptyBufferStartTimeMs)
409409
{
410-
bufferEmptyStartTimeMs = millis();
411-
bufferEmptyStartTimeMs += bufferEmptyStartTimeMs ? 0 : 1;
412-
log_i("no buffer data available");
410+
emptyBufferStartTimeMs = millis();
411+
emptyBufferStartTimeMs += emptyBufferStartTimeMs ? 0 : 1;
412+
log_e("no buffer data available");
413413
return;
414414
}
415415
const auto BAILOUT_MS = 2000;
416-
if (millis() - bufferEmptyStartTimeMs > BAILOUT_MS)
416+
if (millis() - emptyBufferStartTimeMs > BAILOUT_MS)
417417
{
418418
log_e("buffer empty for %i ms, bailing out...", BAILOUT_MS);
419-
bufferEmptyStartTimeMs = 0;
419+
emptyBufferStartTimeMs = 0;
420420
_remainingBytes = 0;
421421
return;
422422
}
423423
return;
424424
}
425-
if (bufferEmptyStartTimeMs)
425+
if (emptyBufferStartTimeMs)
426426
{
427-
log_e("buffer empty for %i ms", millis() - bufferEmptyStartTimeMs);
428-
bufferEmptyStartTimeMs = 0;
427+
log_e("buffer empty for %i ms", millis() - emptyBufferStartTimeMs);
428+
emptyBufferStartTimeMs = 0;
429429
}
430430

431431
_vs1053->playChunk(data, size);
432432
vRingbufferReturnItem(_ringbuffer_handle, data);
433-
bytesToDecoder += size;
433+
//bytesToDecoder += size;
434434
_remainingBytes -= _remainingBytes > 0 ? size : 0;
435435
}
436436
log_d("spend %lu ms stuffing %i bytes in decoder", millis() - START_TIME_MS, bytesToDecoder);

0 commit comments

Comments
 (0)