Changeset 91533 in vbox for trunk/src/VBox

Timestamp:

Oct 4, 2021 6:36:46 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Added checking for the maximum difference (in percent) when binary-comparing. ​bugref:10008

File:

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

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

@@ -2239 +2239 @@
     AssertRC(rc);
 
+    uint32_t cDiffs  = 0;
+    uint64_t cbDiffs = 0;
+
     RT_NOREF(pToneParms);
     uint32_t const cbChunkSize = PDMAudioPropsFrameSize(&pToneParms->Props); /* Use the audio frame size as chunk size. */
@@ -2244 +2247 @@
     uint64_t offCur      = 0;
     uint64_t offLastDiff = UINT64_MAX;
-    uint32_t cDiffs      = 0;
-    uint64_t cbToCompare = RT_MIN(pCmpA->cbSize, pCmpB->cbSize);
+    uint64_t cbSize      = RT_MIN(pCmpA->cbSize, pCmpB->cbSize);
+    uint64_t cbToCompare = cbSize;
 
     while (cbToCompare)
@@ -2269 +2272 @@
             if (cDiffs)
             {
+                uint32_t const cbDiff = offCur - offLastDiff;
                 int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: A @ %#x vs. B @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
                                                                                      pCmpA->offStart, pCmpB->offStart, offLastDiff, offCur,
-                                                                                     offCur - offLastDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, offCur - offLastDiff));
+                                                                                     cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
                 AssertRC(rc2);
+
+                cbDiffs += cbDiff;
             }
             offLastDiff = UINT64_MAX;
@@ -2286 +2292 @@
         && cDiffs)
     {
+        uint32_t const cbDiff = offCur - offLastDiff;
         int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Chunks differ: A @ %#x vs. B @ %#x [%08RU64-%08RU64] (%RU64 bytes, %RU64ms)",
                                                                              pCmpA->offStart, pCmpB->offStart, offLastDiff, offCur,
-                                                                             offCur - offLastDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, offCur - offLastDiff));
+                                                                             cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
         AssertRC(rc2);
+
+        cbDiffs += cbDiff;
+    }
+
+    if (cbDiffs)
+    {
+        uint8_t const uDiffPercent = (cbSize * 100) / cbDiffs;
+        if (uDiffPercent > pVerJob->Opts.uMaxDiffPercent)
+        {
+            int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Files binary-differ too much (expected maximum %RU8%%, got %RU8%%)",
+                                                                                 pVerJob->Opts.uMaxDiffPercent, uDiffPercent);
+            AssertRC(rc2);
+        }
     }