Changeset 89415 in vbox for trunk/src/VBox

Timestamp:

May 31, 2021 8:31:47 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Removed PDMAUDIOFRAME. bugref:9890

File:

• trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (4 diffs)

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

@@ -84 +84 @@
 /** Pointer to the instance data for an VRDE audio driver. */
 typedef DRVAUDIOVRDE *PDRVAUDIOVRDE;
-
-/* Sanity. */
-AssertCompileSize(PDMAUDIOFRAME, sizeof(int64_t) * 2 /* st_sample_t using by VRDP server */);
-
 
 
@@ -588 +584 @@
     /** @todo Find some sane value here. We probably need a VRDE API VRDE to specify this. */
     if (pDrv->cClients)
-        return _16K * sizeof(PDMAUDIOFRAME);
+        return _16K * sizeof(int64_t) * 2;
     return 0;
 }
@@ -631 +627 @@
     Assert(uVrdpFormat == VRDE_AUDIO_FMT_MAKE(PDMAudioPropsHz(pProps), 2, 64, true));
 
-    /* We specified PDMAUDIOSTREAMLAYOUT_RAW (== S64), so
-       convert the buffer pointe and size accordingly:  */
-    PCPDMAUDIOFRAME paSampleBuf    = (PCPDMAUDIOFRAME)pvBuf;
-    uint32_t const  cFramesToWrite = cbBuf / sizeof(paSampleBuf[0]);
-    Assert(cFramesToWrite * sizeof(paSampleBuf[0]) == cbBuf);
-
     /** @todo r=bird: there was some incoherent mumbling about "using the
      *        internal counter to track if we (still) can write to the VRDP
@@ -643 +633 @@
      *        sensible, so I've removed it. */
 
-    /*
-     * Call the VRDP server with the data.
-     */
-    uint32_t cFramesWritten = 0;
-    while (cFramesWritten < cFramesToWrite)
-    {
-        uint32_t const cFramesChunk = cFramesToWrite - cFramesWritten; /** @todo For now write all at once. */
-
-        /* Note: The VRDP server expects int64_t samples per channel, regardless
-                 of the actual  sample bits (e.g 8 or 16 bits). */
-        pDrv->pConsoleVRDPServer->SendAudioSamples(&paSampleBuf[cFramesWritten], cFramesChunk /* Frames */, uVrdpFormat);
-
-        cFramesWritten += cFramesChunk;
-    }
-
-    Log3Func(("cFramesWritten=%RU32\n", cFramesWritten));
-    *pcbWritten = cFramesWritten * sizeof(PDMAUDIOFRAME);
+    uint32_t cFrames = PDMAudioPropsBytesToFrames(&pStream->pStream->Props, cbBuf);
+    Assert(cFrames == cbBuf / (sizeof(uint64_t) * 2));
+    pDrv->pConsoleVRDPServer->SendAudioSamples(pvBuf, cFrames, uVrdpFormat);
+
+    Log3Func(("cFramesWritten=%RU32\n", cFrames));
+    *pcbWritten = PDMAudioPropsFramesToBytes(&pStream->pStream->Props, cFrames);
+    Assert(*pcbWritten == cbBuf);
     return VINF_SUCCESS;
 }