Changeset 88458 in vbox for trunk/src/VBox

Timestamp:

Apr 12, 2021 9:23:30 AM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioValidationKit: Forgot to fix the pCfg stream member. bugref:9890

File:

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

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

@@ -44 +44 @@
 {
     /** The stream's acquired configuration. */
-    PPDMAUDIOSTREAMCFG  pCfg;
+    PDMAUDIOSTREAMCFG   Cfg;
     /** Audio file to dump output to or read input from. */
     PAUDIOHLPFILE       pFile;
@@ -207 +207 @@
     else
         rc = drvHostValKitAudioCreateStreamOut(pThis, pStreamDbg, pCfgReq, pCfgAcq);
-    if (RT_SUCCESS(rc))
-    {
-        pStreamDbg->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
-        if (!pStreamDbg->pCfg)
-            rc = VERR_NO_MEMORY;
-    }
-
+    PDMAudioStrmCfgCopy(&pStreamDbg->Cfg, pCfgAcq);
     return rc;
 }
@@ -227 +221 @@
     AssertPtrReturn(pStreamDbg, VERR_INVALID_POINTER);
 
-    if (   pStreamDbg->pCfg->enmDir == PDMAUDIODIR_OUT
+    if (   pStreamDbg->Cfg.enmDir == PDMAUDIODIR_OUT
         && pStreamDbg->Out.pbPlayBuffer)
     {
@@ -248 +242 @@
         RTStrmClose(pStreamDbg->pFileTiming);
         pStreamDbg->pFileTiming = NULL;
-    }
-
-    if (pStreamDbg->pCfg)
-    {
-        PDMAudioStrmCfgFree(pStreamDbg->pCfg);
-        pStreamDbg->pCfg = NULL;
     }
 
@@ -328 +316 @@
 
     // Microseconds are used everythere below
-    uint32_t const cFrames = PDMAudioPropsBytesToFrames(&pStreamDbg->pCfg->Props, cbBuf);
+    uint32_t const cFrames = PDMAudioPropsBytesToFrames(&pStreamDbg->Cfg.Props, cbBuf);
     RTStrmPrintf(pStreamDbg->pFileTiming, "%d %d %d %d\n",
                  // Host time elapsed since Guest submitted the first buffer for playback:
                  (uint32_t)(cNsSinceStart / 1000),
                  // how long all the samples submitted previously were played:
-                 (uint32_t)(pStreamDbg->cFramesSinceStarted * 1.0E6 / pStreamDbg->pCfg->Props.uHz),
+                 (uint32_t)(pStreamDbg->cFramesSinceStarted * 1.0E6 / pStreamDbg->Cfg.Props.uHz),
                  // how long a new uSamplesReady samples should/will be played:
-                 (uint32_t)(cFrames * 1.0E6 / pStreamDbg->pCfg->Props.uHz),
+                 (uint32_t)(cFrames * 1.0E6 / pStreamDbg->Cfg.Props.uHz),
                  cFrames);