Changeset 92379 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 11, 2021 5:32:37 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Better check for silent blocks in audioTestFilesFindDiffsBinary(). bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (4 diffs)

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

@@ -2242 +2242 @@
 
 /**
+ * Determines if a given file chunk contains all silence (i.e. non-audible audio data) or not.
+ *
+ * What "silence" means depends on the given PCM parameters.
+ *
+ * @returns VBox status code.
+ * @param   phFile              File handle of file to determine silence for.
+ * @param   pProps              PCM properties to use.
+ * @param   offStart            Start offset (absolute, in bytes) to start at.
+ * @param   cbSize              Size (in bytes) to process.
+ * @param   pfIsSilence         Where to return the result.
+ *
+ * @note    Does *not* modify the file's current position.
+ */
+static int audioTestFileChunkIsSilence(PRTFILE phFile, PPDMAUDIOPCMPROPS pProps, uint64_t offStart, size_t cbSize,
+                                       bool *pfIsSilence)
+{
+    bool fIsSilence = true;
+
+    int rc = RTFileSeek(*phFile, offStart, RTFILE_SEEK_BEGIN, NULL);
+    AssertRCReturn(rc, rc);
+
+    uint8_t auBuf[_64K];
+    while (cbSize)
+    {
+        size_t cbRead;
+        rc = RTFileRead(*phFile, auBuf, RT_MIN(cbSize, sizeof(auBuf)), &cbRead);
+        AssertRC(rc);
+
+        if (!PDMAudioPropsIsBufferSilence(pProps, auBuf, cbRead))
+        {
+            fIsSilence = false;
+            break;
+        }
+
+        AssertBreak(cbSize >= cbRead);
+        cbSize -= cbRead;
+    }
+
+    if (RT_SUCCESS(rc))
+        *pfIsSilence = fIsSilence;
+
+    return RTFileSeek(*phFile, offStart, RTFILE_SEEK_BEGIN, NULL);
+}
+
+/**
  * Finds differences in two audio test files by binary comparing chunks.
  *
@@ -2298 +2343 @@
             if (fInDiff)
             {
-                bool const fIsAllSilenceA = PDMAudioPropsIsBufferSilence(&pToneParms->Props, auBufA, cbToCmp);
-                bool const fIsAllSilenceB = PDMAudioPropsIsBufferSilence(&pToneParms->Props, auBufB, cbToCmp);
+                bool fIsAllSilenceA;
+                rc = audioTestFileChunkIsSilence(&pCmpA->hFile, &pToneParms->Props,
+                                                 pCmpA->offStart + offDiffStart, offCur - offDiffStart, &fIsAllSilenceA);
+                AssertRCBreak(rc);
+
+                bool fIsAllSilenceB;
+                rc = audioTestFileChunkIsSilence(&pCmpB->hFile, &pToneParms->Props,
+                                                 pCmpB->offStart + offDiffStart, offCur - offDiffStart, &fIsAllSilenceB);
+                AssertRCBreak(rc);
 
                 uint32_t const cbDiff = offCur - offDiffStart;
-                int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: A @ %#x [%08RU64-%08RU64] vs. B @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
-                                                                                     pCmpA->offStart + offDiffStart, pCmpA->offStart + offDiffStart, pCmpA->offStart + offCur,
-                                                                                     pCmpB->offStart + offDiffStart, pCmpB->offStart + offDiffStart, pCmpB->offStart + offCur,
+                int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: '%s' @ %#x [%08RU64-%08RU64] vs. '%s' @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
+                                                                                     pCmpA->pszName, pCmpA->offStart + offDiffStart, pCmpA->offStart + offDiffStart, pCmpA->offStart + offCur,
+                                                                                     pCmpB->pszName, pCmpB->offStart + offDiffStart, pCmpB->offStart + offDiffStart, pCmpB->offStart + offCur,
                                                                                      cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
                 AssertRC(rc2);
@@ -2311 +2363 @@
                 {
                     rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunk %s @ %#x (%RU64 bytes, %RU64ms) is all silence",
-                                                                                     fIsAllSilenceA ? "A" : "B",
+                                                                                     fIsAllSilenceA ? pCmpA->pszName : pCmpB->pszName,
                                                                                      offDiffStart, cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
                     AssertRC(rc2);
@@ -2330 +2382 @@
     {
         uint32_t const cbDiff = offCur - offDiffStart;
-        int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: A @ %#x [%08RU64-%08RU64] vs. B @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
-                                                                             pCmpA->offStart + offDiffStart, pCmpA->offStart + offDiffStart, pCmpA->offStart + offCur,
-                                                                             pCmpB->offStart + offDiffStart, pCmpB->offStart + offDiffStart, pCmpB->offStart + offCur,
+        int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: '%s' @ %#x [%08RU64-%08RU64] vs. '%s' @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
+                                                                             pCmpA->pszName, pCmpA->offStart + offDiffStart, pCmpA->offStart + offDiffStart, pCmpA->offStart + offCur,
+                                                                             pCmpB->pszName, pCmpB->offStart + offDiffStart, pCmpB->offStart + offDiffStart, pCmpB->offStart + offCur,
                                                                              cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
         AssertRC(rc2);