Changeset 88394 in vbox for trunk/src

Timestamp:

Apr 7, 2021 11:03:58 AM (4 years ago)

Author:

vboxsync

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

143642

Message:

DrvAudioRec,DrvHostAudioValidationKit: doxygen fixes. some cleanups. bugref:9890

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (3 diffs)
• Main/src-client/DrvAudioRec.cpp (modified) (3 diffs)

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

@@ -37 +37 @@
     /** Audio file to dump output to or read input from. */
     PPDMAUDIOFILE      pFile;
-    /** Text file to store timing of audio buffers submittions**/
+    /** Text file to store timing of audio buffers submittions. */
     RTFILE             hFileTiming;
-    /** Timestamp of the first play or record request**/
+    /** Timestamp of the first play or record request. */
     uint64_t           tsStarted;
-    /** Total number of samples played or recorded so far**/
-    uint32_t           uSamplesSinceStarted;
+    /** Total number of frames played or recorded so far. */
+    uint32_t           cFramesSinceStarted;
     union
     {
@@ -122 +122 @@
 
     pStreamDbg->tsStarted = 0;
-    pStreamDbg->uSamplesSinceStarted = 0;
+    pStreamDbg->cFramesSinceStarted = 0;
     pStreamDbg->Out.tsLastPlayed  = 0;
     pStreamDbg->Out.cbPlayBuffer  = PDMAudioPropsFramesToBytes(&pCfgReq->Props, pCfgReq->Backend.cFramesBufferSize);
@@ -197 +197 @@
  */
 static DECLCALLBACK(int) drvHostValKitAudioHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                         const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
-{
-    PDRVHOSTVAKITAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTVAKITAUDIO, IHostAudio);
+                                                         const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
+    PDRVHOSTVAKITAUDIO pThis      = RT_FROM_MEMBER(pInterface, DRVHOSTVAKITAUDIO, IHostAudio);
     PVAKITAUDIOSTREAM  pStreamDbg = (PVAKITAUDIOSTREAM)pStream;
-    RT_NOREF(pDrv);
-
-    uint64_t tsSinceStart;
-    size_t cch;
+    RT_NOREF(pThis);
+
+    uint64_t cNsSinceStart;
+    if (pStreamDbg->tsStarted != 0)
+        cNsSinceStart = RTTimeNanoTS() - pStreamDbg->tsStarted;
+    else
+    {
+        pStreamDbg->tsStarted = RTTimeNanoTS();
+        cNsSinceStart = 0;
+    }
+
+    // Microseconds are used everythere below
+    uint32_t const cFrames = PDMAudioPropsBytesToFrames(&pStreamDbg->pCfg->Props, cbBuf);
     char szTimingInfo[128];
-
-    if (pStreamDbg->tsStarted == 0)
-    {
-        pStreamDbg->tsStarted = RTTimeNanoTS();
-        tsSinceStart = 0;
-    }
-    else
-    {
-        tsSinceStart = RTTimeNanoTS() - pStreamDbg->tsStarted;
-    }
-
-    // Microseconds are used everythere below
-    uint32_t sBuf = uBufSize >> pStreamDbg->pCfg->Props.cShift;
-    cch = RTStrPrintf(szTimingInfo, sizeof(szTimingInfo), "%d %d %d %d\n",
-        (uint32_t)(tsSinceStart / 1000), // Host time elapsed since Guest submitted the first buffer for playback
-        (uint32_t)(pStreamDbg->uSamplesSinceStarted * 1.0E6 / pStreamDbg->pCfg->Props.uHz), // how long all the samples submitted previously were played
-        (uint32_t)(sBuf * 1.0E6 / pStreamDbg->pCfg->Props.uHz), // how long a new uSamplesReady samples should\will be played
-        sBuf);
+    size_t cch = RTStrPrintf(szTimingInfo, sizeof(szTimingInfo), "%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),
+                             // how long a new uSamplesReady samples should/will be played:
+                             (uint32_t)(cFrames * 1.0E6 / pStreamDbg->pCfg->Props.uHz),
+                             cFrames);
     RTFileWrite(pStreamDbg->hFileTiming, szTimingInfo, cch, NULL);
-    pStreamDbg->uSamplesSinceStarted += sBuf;
+    pStreamDbg->cFramesSinceStarted += cFrames;
 
     /* Remember when samples were consumed. */
-   // pStreamDbg->Out.tsLastPlayed = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);;
-
-    int rc2 = AudioHlpFileWrite(pStreamDbg->pFile, pvBuf, uBufSize, 0 /* fFlags */);
+   // pStreamDbg->Out.tsLastPlayed = PDMDrvHlpTMGetVirtualTime(pThis->pDrvIns);
+
+    int rc2 = AudioHlpFileWrite(pStreamDbg->pFile, pvBuf, cbBuf, 0 /* fFlags */);
     if (RT_FAILURE(rc2))
         LogRel(("VaKitAudio: Writing output failed with %Rrc\n", rc2));
 
-    *puWritten = uBufSize;
+    *pcbWritten = cbBuf;
 
     return VINF_SUCCESS;

trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

@@ -653 +653 @@
  */
 static DECLCALLBACK(int) drvAudioVideoRecHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                       const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
-    AssertReturn(uBufSize,         VERR_INVALID_PARAMETER);
-    /* puWritten is optional. */
-
-    PDRVAUDIORECORDING pThis     = PDMIHOSTAUDIO_2_DRVAUDIORECORDING(pInterface);
+                                                       const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
     RT_NOREF(pThis);
-    PAVRECSTREAM      pStreamAV = (PAVRECSTREAM)pStream;
+    PAVRECSTREAM pStreamAV = (PAVRECSTREAM)pStream;
+    AssertPtrReturn(pStreamAV, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
+    AssertReturn(pcbWritten, VERR_INVALID_PARAMETER);
 
     int rc = VINF_SUCCESS;
@@ -683 +680 @@
     size_t cbCircBuf;
 
-    uint32_t cbToWrite = uBufSize;
+    uint32_t cbToWrite = cbBuf;
 
     /*
@@ -821 +818 @@
     }
 
-    if (puWritten)
-        *puWritten = cbWrittenTotal;
+    *pcbWritten = cbWrittenTotal;
 #else
     /* Report back all data as being processed. */
-    if (puWritten)
-        *puWritten = uBufSize;
+    *pcbWritten = cbBuf;
 
     rc = VERR_NOT_SUPPORTED;