Changeset 103568 in vbox

Timestamp:

Feb 26, 2024 1:08:48 PM (13 months ago)

Author:

vboxsync

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

161919

Message:

Audio/VKAT: Use a circular buffer when recording data; should make it easier to detect and handle start/stop beacons [build fix].

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp (modified) (8 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -854 +854 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cbToReadTotal = PDMAudioPropsMilliToBytes(&pStream->Cfg.Props, pParms->msDuration);
+        size_t cbToReadTotal = PDMAudioPropsMilliToBytes(&pStream->Cfg.Props, pParms->msDuration);
         AssertStmt(cbToReadTotal, rc = VERR_INVALID_PARAMETER);
-        uint32_t cbReadTotal   = 0; /* Counts the read test tone data (w/o any beacons). */
+        size_t cbReadTotal   = 0; /* Counts the read test tone data (w/o any beacons). */
 
         RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Recording %RU32 bytes total (%RU32ms timeout)\n",
@@ -925 +925 @@
                 if (cbBlock)
                 {
-                    rc = AudioTestMixStreamCapture(pMix, pvBlock, cbBlock, &cbCaptured);
+                    rc = AudioTestMixStreamCapture(pMix, pvBlock, (uint32_t)cbBlock, &cbCaptured);
                     if (RT_FAILURE(rc))
                        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Reading from stream failed with %Rrc\n", idxTest, rc);
@@ -964 +964 @@
             if (pTstEnv->fSelftest) /* For self-test mode we want to have a bit more randomness. */
             {
-                size_t const u = RTCircBufUsed(pCircBuf);
-                size_t const r = RTRandU32Ex(1, RTCircBufSize(pCircBuf));
-                cbBlockToAcq   = PDMAudioPropsFloorBytesToFrame(pMix->pProps, RT_MIN(u, r));
+                size_t const u = (uint32_t)RTCircBufUsed(pCircBuf);
+                size_t const r = RTRandU32Ex(1, (uint32_t)RTCircBufSize(pCircBuf));
+                cbBlockToAcq   = PDMAudioPropsFloorBytesToFrame(pMix->pProps, RT_MIN((uint32_t)u, (uint32_t)r));
             }
             else
-                cbBlockToAcq = PDMAudioPropsFloorBytesToFrame(pMix->pProps, RTCircBufUsed(pCircBuf));
+                cbBlockToAcq = PDMAudioPropsFloorBytesToFrame(pMix->pProps, (uint32_t)RTCircBufUsed(pCircBuf));
 
             RTCircBufAcquireReadBlock(pCircBuf, cbBlockToAcq, &pvBlock, &cbBlock);
@@ -977 +977 @@
             /* Flag indicating whether the whole block we've captured is silence or not. */
             bool const fIsAllSilence = PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBlock, cbBlock);
-            uint32_t   cbRead = 0;
+            size_t     cbRead = 0;
 
             switch (enmState)
@@ -1002 +1002 @@
                         {
                             RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS,
-                                         "Test #%RU32: Detection of %s beacon started (%RU32ms recorded so far)\n",
+                                         "Test #%RU32: Detection of %s beacon started (%RU64ms recorded so far)\n",
                                          idxTest, AudioTestBeaconTypeGetName(Beacon.enmType),
-                                         PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, cbReadTotal));
+                                         PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, (uint32_t)cbReadTotal));
                         }
 
@@ -1086 +1086 @@
             {
                 if (g_uVerbosity >= 3)
-                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Read data (%RU32 bytes):\n"
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Read data (%zu bytes):\n"
                                                             "%.*Rhxd\n",
                                  idxTest, cbRead, cbRead, pvBlock);
@@ -1097 +1097 @@
 
             if (g_uVerbosity >= 2)
-                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Processed %RU64ms (%RU32 bytes)\n",
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Processed %RU64ms (%zu bytes)\n",
                              idxTest, PDMAudioPropsBytesToMilli(pMix->pProps, cbRead), cbRead);
 
@@ -1119 +1119 @@
 
         if (g_uVerbosity >= 2)
-            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Recorded %RU32 bytes total\n", idxTest, cbReadTotal);
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Recorded %zu bytes total\n", idxTest, cbReadTotal);
         if (cbReadTotal != cbToReadTotal)
         {
-            RTTestFailed(g_hTest, "Test #%RU32: Recording ended unexpectedly (%RU32 read, expected %RU32)\n",
+            RTTestFailed(g_hTest, "Test #%RU32: Recording ended unexpectedly (%zu read, expected %zu)\n",
                          idxTest, cbReadTotal, cbToReadTotal);
             int rc2 = cbReadTotal > cbToReadTotal ? VERR_BUFFER_OVERFLOW : VERR_BUFFER_UNDERFLOW;