Changeset 89078 in vbox

Timestamp:

May 17, 2021 8:59:39 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144418

Message:

AudioTest/Wave: Hack to skip PAD chunk. bugref:10008

Location:

trunk

Files:

• include/iprt/formats/riff.h (modified) (1 diff)
• src/VBox/Devices/Audio/AudioTest.cpp (modified) (4 diffs)

trunk/include/iprt/formats/riff.h

@@ -157 +157 @@
 
 /** Magic value for RTRIFFWAVEFMT::uMagic ('data'). */
-#define RTRIFFWAVEDATACHUNK_MAGIC RT_BE2H_U32_C(0x64617461)
+#define RTRIFFWAVEDATACHUNK_MAGIC   RT_BE2H_U32_C(0x64617461)
+
+
+/** Magic value padding chunks ('PAD '). */
+#define RTRIFFPADCHUNK_MAGIC        RT_BE2H_U32_C(0x50414420)
 
 /** @} */

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

@@ -940 +940 @@
             } Wave;
             RTRIFFLIST              List;
+            RTRIFFCHUNK             Chunk;
             RTRIFFWAVEDATACHUNK     Data;
         } uBuf;
@@ -995 +996 @@
                     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
@@ -1004 +1006 @@
                         }
 
+                        /* 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;
@@ -1013 +1023 @@
                         {
                             pWaveFile->cbSamples = uBuf.Data.Chunk.cbChunk;
+
                             /*
                              * We're good!