Changeset 91761 in vbox

Timestamp:

Oct 15, 2021 11:26:17 AM (3 years ago)

Author:

vboxsync

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

147533

Message:

Audio/Validation Kit: Return and use last beacon offset when comparing test set audio data. ​bugref:10008

File:

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

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

@@ -2327 +2327 @@
  * @param   pCmp                File comparison parameters to file to verify beacon for.
  * @param   pToneParms          Tone parameters to use for verification.
+ * @param   puOff               Where to return the file offset (in bytes) right after the found beacon.
  */
 static int audioTestToneVerifyBeacon(PAUDIOTESTVERIFYJOB pVerJob,
-                                     bool fPre, PAUDIOTESTFILECMPPARMS pCmp, PAUDIOTESTTONEPARMS pToneParms)
+                                     bool fPre, PAUDIOTESTFILECMPPARMS pCmp, PAUDIOTESTTONEPARMS pToneParms, uint64_t *puOff)
 {
     int rc = RTFileSeek(pCmp->hFile, pCmp->offStart, RTFILE_SEEK_BEGIN, NULL);
@@ -2335 +2336 @@
 
     uint8_t        auBuf[64];
-    uint64_t       cbToCompare = pCmp->cbSize;
-    uint32_t const cbFrameSize = PDMAudioPropsFrameSize(&pToneParms->Props); /* Use the audio frame size as chunk size. */
-    bool           fInBeacon   = false;
-    uint32_t       cbBeacon    = 0;
+    uint64_t       cbToCompare   = pCmp->cbSize;
+    uint32_t const cbFrameSize   = PDMAudioPropsFrameSize(&pToneParms->Props); /* Use the audio frame size as chunk size. */
+    bool           fInBeacon     = false;
+    uint32_t       cbBeacon      = 0;
+    size_t         offLastBeacon = 0; /* Offset (in bytes) of last beacon read. */
 
     uint8_t const  byBeacon    = fPre ? AUDIOTEST_BEACON_BYTE_PRE : AUDIOTEST_BEACON_BYTE_POST;
@@ -2372 +2374 @@
                 if (fInBeacon)
                 {
-                    fInBeacon = false;
+                    fInBeacon     = false;
+                    offLastBeacon = RTFileTell(pCmp->hFile);
                     continue;
                 }
@@ -2395 +2398 @@
                                             pCmp->pszName, fPre ? "Pre" : "Post");
         AssertRC(rc2);
+
+        if (puOff)
+            *puOff = offLastBeacon;
     }
 
@@ -2551 +2557 @@
 #endif
 
-    rc = audioTestToneVerifyBeacon(pVerJob, true  /* fPre */,  &FileA, &ToneParmsA);
+    rc = audioTestToneVerifyBeacon(pVerJob, true  /* fPre */,  &FileA, &ToneParmsA, &FileA.offStart /* Save new offset after pre beacon */);
     AssertRC(rc);
-    rc = audioTestToneVerifyBeacon(pVerJob, false /* fPost */, &FileA, &ToneParmsA);
+    rc = audioTestToneVerifyBeacon(pVerJob, false /* fPost */, &FileA, &ToneParmsA, NULL);
     AssertRC(rc);
-    rc = audioTestToneVerifyBeacon(pVerJob, true  /* fPre */,  &FileB, &ToneParmsB);
+    rc = audioTestToneVerifyBeacon(pVerJob, true  /* fPre */,  &FileB, &ToneParmsB, &FileB.offStart /* Save new offset after pre beacon */);
     AssertRC(rc);
-    rc = audioTestToneVerifyBeacon(pVerJob, false /* fPost */, &FileB, &ToneParmsB);
+    rc = audioTestToneVerifyBeacon(pVerJob, false /* fPost */, &FileB, &ToneParmsB, NULL);
     AssertRC(rc);