Changeset 91643 in vbox

Timestamp:

Oct 8, 2021 2:16:17 PM (3 years ago)

Author:

vboxsync

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

147368

Message:

Audio/Validation Kit: Fixes for audioTestFilesFindDiffsBinary(). ​bugref:10008

File:

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

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

@@ -2245 +2245 @@
     uint32_t const cbChunkSize = PDMAudioPropsFrameSize(&pToneParms->Props); /* Use the audio frame size as chunk size. */
 
-    uint64_t offCur      = 0;
-    uint64_t offLastDiff = UINT64_MAX;
-    uint64_t cbSize      = RT_MIN(pCmpA->cbSize, pCmpB->cbSize);
-    uint64_t cbToCompare = cbSize;
+    uint64_t offCur       = 0;
+    uint64_t offDiffStart = 0;
+    bool     fInDiff      = false;
+    uint64_t cbSize       = RT_MIN(pCmpA->cbSize, pCmpB->cbSize);
+    uint64_t cbToCompare  = cbSize;
 
     while (cbToCompare)
@@ -2262 +2263 @@
         if (memcmp(auBufA, auBufB, RT_MIN(cbReadA, cbReadB)) != 0)
         {
-            if (offLastDiff == UINT64_MAX) /* No consequitive different chunk? Count as new then. */
+            if (!fInDiff) /* No consequitive different chunk? Count as new then. */
             {
                 cDiffs++;
-                offLastDiff = offCur;
+                offDiffStart = offCur;
+                fInDiff  = true;
             }
         }
         else /* Reset and count next difference as new then. */
         {
-            if (cDiffs)
+            if (fInDiff)
             {
-                uint32_t const cbDiff = offCur - offLastDiff;
+                uint32_t const cbDiff = offCur - offDiffStart;
                 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,
+                                                                                     pCmpA->offStart, pCmpB->offStart, offDiffStart, offCur,
                                                                                      cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
                 AssertRC(rc2);
@@ -2280 +2282 @@
                 cbDiffs += cbDiff;
             }
-            offLastDiff = UINT64_MAX;
+            fInDiff = false;
         }
 
@@ -2289 +2291 @@
 
     /* If we didn't mention the last diff yet, do so now. */
-    if (   offLastDiff != UINT64_MAX
-        && cDiffs)
-    {
-        uint32_t const cbDiff = offCur - offLastDiff;
+    if (fInDiff)
+    {
+        uint32_t const cbDiff = offCur - offDiffStart;
         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,
+                                                                             pCmpA->offStart, pCmpB->offStart, offDiffStart, offCur,
                                                                              cbDiff, PDMAudioPropsBytesToMilli(&pToneParms->Props, cbDiff));
         AssertRC(rc2);
@@ -2301 +2302 @@
     }
 
-    if (cbDiffs)
-    {
-        uint8_t const uDiffPercent = (cbSize * 100) / cbDiffs;
+    if (   cbSize
+        && cbDiffs)
+    {
+        uint8_t const uDiffPercent = cbDiffs / (cbSize * 100);
         if (uDiffPercent > pVerJob->Opts.uMaxDiffPercent)
         {