Use the flac patches from vlsi (#89)

* Use the flac patches from vlsi
* Less branching

Author: CelliesProjects

src/ESP32_VS1053_Stream.cpp

@@ -147,10 +147,12 @@ bool ESP32_VS1053_Stream::startDecoder(const uint8_t CS, const uint8_t DCS, cons
     _vs1053->begin();
     _vs1053->switchToMp3Mode();
     if (_vs1053->getChipVersion() == 4)
-        _vs1053->loadDefaultVs1053Patches();
+    {
+        log_i("Patching vs1053 firmware");
+        _vs1053->loadUserCode(PATCHES_FLAC, PATCHES_FLAC_SIZE);
+    }
     setVolume(_volume);
-    if (!_ringbuffer_handle)
-        _allocateRingbuffer();
+    _allocateRingbuffer();
     return true;
 }
 
@@ -966,6 +968,10 @@ void ESP32_VS1053_Stream::_readBitRate()
             _codec = CODEC_OGG;
             break;
 
+        case 0x664C:
+            _codec = CODEC_FLAC;
+            break;
+
         default:
             if ((hdat1 & 0xFFE0) == 0xFFE0)
                 _codec = CODEC_MP3;
@@ -997,7 +1003,7 @@ void ESP32_VS1053_Stream::_readBitRate()
             bitrate = bitrateTable[version == 3 ? 0 : 1][brIndex];
     }
     else
-        bitrate = (hdat0 * 8) / 1000;
+        bitrate = (_codec == CODEC_FLAC) ? 0 : (hdat0 * 8) / 1000;
 
     if (bitrate != _bitrate)
     {
@@ -1008,11 +1014,9 @@ void ESP32_VS1053_Stream::_readBitRate()
 
 const char *ESP32_VS1053_Stream::_codecName(uint8_t codec)
 {
-    const char *_names[9] = {"UNKNOWN", "ADTS", "ADIF", "MP4", "WAV", "WMA", "MIDI", "MP3", "OGG"};
+    const char *name[] = {"UNKNOWN", "ADTS", "ADIF", "MP4", "WAV", "WMA", "MIDI", "MP3", "OGG", "FLAC"};
 
-    if (codec >= sizeof(_names) / sizeof(_names[0]))
-        return _names[0];
-    return _names[codec];
+    return name[(codec >= sizeof(name) / sizeof(name[0])) ? 0 : codec];
 }
 
 void ESP32_VS1053_Stream::setCodecCB(codec_callback_t cb)

src/ESP32_VS1053_Stream.h

@@ -143,6 +143,7 @@ class ESP32_VS1053_Stream
         CODEC_MIDI,
         CODEC_MP3,
         CODEC_OGG,
+        CODEC_FLAC
     };
 
     uint8_t _codec = CODEC_UNKNOWN;