Refactor stream unavailable code

Also auto-format cleaned up previous commit

Author: CelliesProjects

src/ESP32_VS1053_Stream.cpp

@@ -392,7 +392,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
 
     const unsigned long start = millis();
     const auto MAX_TIME_MS = 15;
-    //size_t bytesToDecoder = 0;
+    // size_t bytesToDecoder = 0;
     while (_remainingBytes && _vs1053->data_request() && millis() - start < MAX_TIME_MS)
     {
         size_t size = 0;
@@ -404,7 +404,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
         }
         _vs1053->playChunk(data, size);
         vRingbufferReturnItem(_ringbuffer_handle, data);
-        //bytesToDecoder += size;
+        // bytesToDecoder += size;
         _remainingBytes -= _remainingBytes > 0 ? size : 0;
     }
     log_d("spend %lu ms stuffing %i bytes in decoder", millis() - start, bytesToDecoder);
@@ -414,7 +414,7 @@ void ESP32_VS1053_Stream::_streamToRingBuffer(WiFiClient *const stream)
 {
     const auto MAX_TIME_MS = 10;
     const auto start = millis();
-    //size_t bytesToRingBuffer = 0;
+    // size_t bytesToRingBuffer = 0;
     while (stream && stream->available() && _musicDataPosition < _metaDataStart && millis() - start < MAX_TIME_MS)
     {
         const size_t BYTES_AVAILABLE = _metaDataStart ? _metaDataStart - _musicDataPosition : stream->available();
@@ -432,7 +432,7 @@ void ESP32_VS1053_Stream::_streamToRingBuffer(WiFiClient *const stream)
             return;
         }
 
-        //bytesToRingBuffer += BYTES_IN_BUFFER;
+        // bytesToRingBuffer += BYTES_IN_BUFFER;
         _musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0;
     }
     log_d("spend %lu ms stuffing %i bytes in ringbuffer", millis() - start, bytesToRingBuffer);
@@ -458,7 +458,7 @@ void ESP32_VS1053_Stream::_handleStream(WiFiClient *const stream)
     {
         const auto MAX_TIME_MS = 15;
         const auto start = millis();
-        //size_t bytesToDecoder = 0;
+        // size_t bytesToDecoder = 0;
         while (stream && stream->available() && _vs1053->data_request() && _remainingBytes &&
                _musicDataPosition < _metaDataStart && millis() - start < MAX_TIME_MS)
         {
@@ -472,7 +472,7 @@ void ESP32_VS1053_Stream::_handleStream(WiFiClient *const stream)
             _vs1053->playChunk(_vs1053Buffer, BYTES_IN_BUFFER);
             _remainingBytes -= _remainingBytes > 0 ? BYTES_IN_BUFFER : 0;
             _musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0;
-            //bytesToDecoder += BYTES_IN_BUFFER;
+            // bytesToDecoder += BYTES_IN_BUFFER;
         }
         log_d("spend %lu ms stuffing %i bytes in decoder", millis() - start, bytesToDecoder);
     }
@@ -494,7 +494,7 @@ void ESP32_VS1053_Stream::_handleStream(WiFiClient *const stream)
 void ESP32_VS1053_Stream::_chunkedStreamToRingBuffer(WiFiClient *const stream)
 {
     const auto MAX_TIME_MS = 10;
-    //size_t bytesToRingBuffer = 0;
+    // size_t bytesToRingBuffer = 0;
     const auto start = millis();
     while (stream && stream->available() && _bytesLeftInChunk && _musicDataPosition < _metaDataStart && millis() - start < MAX_TIME_MS)
     {
@@ -514,7 +514,7 @@ void ESP32_VS1053_Stream::_chunkedStreamToRingBuffer(WiFiClient *const stream)
         }
 
         _bytesLeftInChunk -= BYTES_IN_BUFFER;
-        //bytesToRingBuffer += BYTES_IN_BUFFER;
+        // bytesToRingBuffer += BYTES_IN_BUFFER;
         _musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0;
     }
     log_d("spend %lu ms stuffing %i bytes in ringbuffer", millis() - start, bytesToRingBuffer);
@@ -549,7 +549,7 @@ void ESP32_VS1053_Stream::_handleChunkedStream(WiFiClient *const stream)
     {
         const auto MAX_TIME_MS = 15;
         const auto start = millis();
-        //size_t bytesToDecoder = 0;
+        // size_t bytesToDecoder = 0;
         while (stream && stream->available() && _bytesLeftInChunk && _vs1053->data_request() && _musicDataPosition < _metaDataStart && millis() - start < MAX_TIME_MS)
         {
             const size_t BYTES_AVAILABLE = min(_bytesLeftInChunk, (size_t)_metaDataStart - _musicDataPosition);
@@ -562,7 +562,7 @@ void ESP32_VS1053_Stream::_handleChunkedStream(WiFiClient *const stream)
             _vs1053->playChunk(_vs1053Buffer, BYTES_IN_BUFFER);
             _bytesLeftInChunk -= BYTES_IN_BUFFER;
             _musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0;
-            //bytesToDecoder += BYTES_IN_BUFFER;
+            // bytesToDecoder += BYTES_IN_BUFFER;
         }
         log_d("spend %lu ms stuffing %i bytes in decoder", millis() - start, bytesToDecoder);
     }
@@ -644,11 +644,21 @@ void ESP32_VS1053_Stream::loop()
             _eofStream();
             return;
         }
+        return;
+    }
+
+    if (_ringbuffer_handle && stream && !stream->available())
+    {
+        if (!_streamStalledTime)
+        {
+            _streamStalledTime = millis();
+            _streamStalledTime += _streamStalledTime ? 0 : 1;
+        }
     }
 
-    if (_streamStalledTime)
+    if (stream && stream->available() && _streamStalledTime)
     {
-        log_d("Stream stalled for %lu ms", millis() - _streamStalledTime);
+        log_w("Stream stalled for %lu ms", millis() - _streamStalledTime);
         _streamStalledTime = 0;
     }