Fix the playback of Ogg files when (re)-started with an offset. (#16)

And a fix for #15

Author: CelliesProjects

README.md

@@ -44,6 +44,9 @@ void setup() {
     Serial.begin(115200);
 
     WiFi.begin(SSID, PSK);
+    
+    WiFi.setSleep(false); 
+    /* important to set this right! See issue #15 */
 
     Serial.println("\n\nSimple vs1053 Streaming example.");
 

examples/simple/simple.ino

@@ -25,6 +25,9 @@ void setup() {
 
     WiFi.begin(SSID, PSK);
 
+    WiFi.setSleep(false); 
+    /* important to set this right! See issue #15 */
+    
     Serial.println("\n\nSimple vs1053 Streaming example.");
 
     while (!WiFi.isConnected())

src/ESP32_VS1053_Stream.cpp

@@ -339,7 +339,12 @@ bool ESP32_VS1053_Stream::connecttohost(const char *url, const char *username,
         _metaDataStart = _http->header(ICY_METAINT).toInt();
         _musicDataPosition = _metaDataStart ? 0 : -100;
         _bitrate = _http->header(BITRATE).toInt();
-        snprintf(_url, sizeof(_url), "%s", url);
+        _url[0] = _savedStartChar;
+        if (strcmp(_url, url)) /* 0 means strings are equal*/
+        {
+            _vs1053->stopSong();
+            snprintf(_url, sizeof(_url), "%s", url);
+        }
         _streamStalledTime = 0;
         log_d("redirected %i times", _redirectCount);
         _redirectCount = 0;
@@ -410,7 +415,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
                 return;
             }
             const auto BAILOUT_MS = 2000;
-            if (millis() - ringbufferEmpty > BAILOUT_MS) 
+            if (millis() - ringbufferEmpty > BAILOUT_MS)
             {
                 log_e("Buffer empty for %i ms, bailing out...", BAILOUT_MS);
                 _remainingBytes = 0;
@@ -572,7 +577,7 @@ void ESP32_VS1053_Stream::_handleChunkedStream(WiFiClient *const stream)
     }
     else
     {
-        const auto MAX_TIME_MS = 15;
+        const auto MAX_TIME_MS = 20;
         const auto start = millis();
         // size_t bytesToDecoder = 0;
         while (stream && stream->available() && _bytesLeftInChunk && _vs1053->data_request() && _musicDataPosition < _metaDataStart && millis() - start < MAX_TIME_MS)
@@ -693,7 +698,8 @@ void ESP32_VS1053_Stream::loop()
 
     if (_startMute)
     {
-        const auto WAIT_TIME_MS = ((!_bitrate && _remainingBytes == -1) || _currentCodec == AAC || _currentCodec == AACP)
+        const auto WAIT_TIME_MS = ((!_bitrate && _remainingBytes == -1) ||
+                                   _currentCodec == AAC || _currentCodec == AACP || _currentCodec == OGG)
                                       ? 380
                                       : 80;
         if (millis() - _startMute > WAIT_TIME_MS)
@@ -738,13 +744,13 @@ void ESP32_VS1053_Stream::stopSong()
     _http->end();
     delete _http;
     _http = nullptr;
-    _vs1053->stopSong();
     _deallocateRingbuffer();
     _ringbuffer_filled = false;
     _dataSeen = false;
     _remainingBytes = 0;
     _bytesLeftInChunk = 0;
     _currentCodec = STOPPED;
+    _savedStartChar = _url[0];
     _url[0] = 0;
     _bitrate = 0;
     _offset = 0;
@@ -796,6 +802,6 @@ const char *ESP32_VS1053_Stream::bufferStatus()
     if (!_ringbuffer_handle)
         return "0/0";
     static char ringbuffer_status[24];
-    snprintf(ringbuffer_status, sizeof(ringbuffer_status), "%i/%i", VS1053_PSRAM_BUFFER_SIZE - xRingbufferGetCurFreeSize(_ringbuffer_handle), VS1053_PSRAM_BUFFER_SIZE);
+    snprintf(ringbuffer_status, sizeof(ringbuffer_status), "%u/%lu", VS1053_PSRAM_BUFFER_SIZE - xRingbufferGetCurFreeSize(_ringbuffer_handle), VS1053_PSRAM_BUFFER_SIZE);
     return ringbuffer_status;
 }

src/ESP32_VS1053_Stream.h

@@ -68,6 +68,7 @@ class ESP32_VS1053_Stream
     uint8_t _vs1053Buffer[VS1053_PLAYBUFFER_SIZE];
     uint8_t _localbuffer[VS1053_PSRAM_MAX_MOVE];
     char _url[VS1053_MAX_URL_LENGTH];
+    char _savedStartChar = 0;
 
     RingbufHandle_t _ringbuffer_handle;
     StaticRingbuffer_t *_buffer_struct;