Changeset 89082 in vbox

Timestamp:

May 17, 2021 9:29:53 AM (4 years ago)

Author:

vboxsync

Message:

AudioTest/Wave: Skip loop. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/AudioTest.cpp

@@ -994 +994 @@
                      */
                     rc = RTFileReadAt(pWaveFile->hFile, pWaveFile->offSamples, &uBuf, sizeof(uBuf.List), NULL);
+                    for (uint32_t i = 0;
+                            i < 128
+                         && RT_SUCCESS(rc)
+                         && uBuf.Chunk.uMagic != RTRIFFWAVEDATACHUNK_MAGIC
+                         && (uint64_t)uBuf.Chunk.cbChunk + sizeof(RTRIFFCHUNK) * 2 <= cbFile - pWaveFile->offSamples;
+                         i++)
+                    {
+                        if (   uBuf.List.uMagic    == RTRIFFLIST_MAGIC
+                            && uBuf.List.uListType == RTRIFFLIST_TYPE_INFO)
+                        { /*skip*/ }
+                        else if (uBuf.Chunk.uMagic == RTRIFFPADCHUNK_MAGIC)
+                        { /*skip*/ }
+                        else
+                            break;
+                        pWaveFile->offSamples += sizeof(RTRIFFCHUNK) + uBuf.Chunk.cbChunk;
+                        rc = RTFileReadAt(pWaveFile->hFile, pWaveFile->offSamples, &uBuf, sizeof(uBuf.List), NULL);
+                    }
                     if (RT_SUCCESS(rc))
                     {
-                        /** @todo Use a loop here?   */
-                        /* HACK ALERT: Skip one INFO list and hope we find a data chunk following it: */
-                        if (   uBuf.List.uMagic    == RTRIFFLIST_MAGIC
-                            && uBuf.List.uListType ==  RTRIFFLIST_TYPE_INFO
-                            && uBuf.List.cbChunk   <= (uint32_t)cbFile - pWaveFile->offSamples - sizeof(RTRIFFCHUNK))
-                        {
-                            pWaveFile->offSamples += sizeof(RTRIFFCHUNK) + uBuf.List.cbChunk;
-                            rc = RTFileReadAt(pWaveFile->hFile, pWaveFile->offSamples, &uBuf, sizeof(uBuf.List), NULL);
-                        }
-
-                        /* HACK ALERT: Skip PAD chunk found in some apple wav files */
-                        if (   uBuf.Chunk.uMagic    == RTRIFFPADCHUNK_MAGIC
-                            && uBuf.Chunk.cbChunk   <= (uint32_t)cbFile - pWaveFile->offSamples - sizeof(RTRIFFCHUNK))
-                        {
-                            pWaveFile->offSamples += sizeof(RTRIFFCHUNK) + uBuf.Chunk.cbChunk;
-                            rc = RTFileReadAt(pWaveFile->hFile, pWaveFile->offSamples, &uBuf, sizeof(uBuf.List), NULL);
-                        }
-
                         pWaveFile->offSamples += sizeof(uBuf.Data.Chunk);
                         pWaveFile->cbSamples   = (uint32_t)cbFile - pWaveFile->offSamples;