Account for WAV 'FLLR' chunk

Apple adds a 'FLLR' chunk to their WAV output by AVAudioRecorder app.
justdan96 · Feb 6, 2024 · c37b76e · c37b76e
1 parent 72d4b4e
commit c37b76e
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/tsMuxer/lpcmStreamReader.cpp b/tsMuxer/lpcmStreamReader.cpp
@@ -387,7 +387,7 @@ int LPCMStreamReader::decodeWaveHeader(uint8_t* buff, uint8_t* end)
     if (end - buff < 20)
         return NOT_ENOUGH_BUFFER;
     uint8_t* curPos = buff;
-    if (m_channels == 0)
+    // if (m_channels == 0)
     {
         WAVEFORMATPCMEX* waveFormatPCMEx;
         uint64_t fmtSize;
@@ -496,6 +496,17 @@ int LPCMStreamReader::decodeWaveHeader(uint8_t* buff, uint8_t* end)
         curPos += fmtSize;
     }
 
+    // in case there is a 'FLLR' (IPhone filler), skip it
+    if (curPos[0] == 'F' && curPos[1] == 'L' && curPos[2] == 'L' && curPos[3] == 'R')
+    {
+        curPos += 4;
+        int64_t fllrSize = *reinterpret_cast<int64_t*>(curPos);
+        curPos += 4;
+        if (end - curPos < fllrSize)
+            return NOT_ENOUGH_BUFFER;
+        curPos += fllrSize;
+    }
+
     curPos = findSubstr("data", curPos, FFMIN(curPos + MAX_HEADER_SIZE, end));
     if (curPos == nullptr)
     {