Changeset 88253 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 22, 2021 6:14:09 PM (4 years ago)

Author:

vboxsync

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

143453

Message:

DrvAudio,++: Started going over and tidying up the StreamPlay functionality. First major change is to treat the RAW layout just like non-RAW ones and count all in bytes. bugref:9890

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleVRDPServer.h (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (1 diff)
• src-client/DrvAudioVRDE.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -136 +136 @@
     void SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const;
 
-    void SendAudioSamples (void *pvSamples, uint32_t cSamples, VRDEAUDIOFORMAT format) const;
+    void SendAudioSamples (void const *pvSamples, uint32_t cSamples, VRDEAUDIOFORMAT format) const;
     void SendAudioVolume (uint16_t left, uint16_t right) const;
     void SendUSBRequest (uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const;

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

@@ -3730 +3730 @@
 }
 
-void ConsoleVRDPServer::SendAudioSamples(void *pvSamples, uint32_t cSamples, VRDEAUDIOFORMAT format) const
+void ConsoleVRDPServer::SendAudioSamples(void const *pvSamples, uint32_t cSamples, VRDEAUDIOFORMAT format) const
 {
     if (mpEntryPoints && mhServer)

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

@@ -106 +106 @@
         pCfgAcq->enmLayout                      = PDMAUDIOSTREAMLAYOUT_RAW;
         pCfgAcq->Backend.cFramesPeriod          = cFramesVrdpServer;
-        pCfgAcq->Backend.cFramesBufferSize      = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */
-        pCfgAcq->Backend.cFramesPreBuffering    = pCfgAcq->Backend.cFramesPeriod;
+/** @todo r=bird: This is inconsistent with the above buffer allocation and I
+ * think also ALSA and Pulse backends way of setting cFramesBufferSize. */
+        pCfgAcq->Backend.cFramesBufferSize      = cFramesVrdpServer * 2; /* Use "double buffering". */
+        pCfgAcq->Backend.cFramesPreBuffering    = cFramesVrdpServer;
     }
 
@@ -270 +272 @@
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_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. */
-
-    PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
-    PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
+                                                   const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
+    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
+    AssertPtr(pDrv);
+    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    PVRDESTREAM pStreamVRDE = (PVRDESTREAM)pStream;
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbWritten, VERR_INVALID_POINTER);
 
     if (!pDrv->pConsoleVRDPServer)
         return VERR_NOT_AVAILABLE;
 
-    /* Note: We get the number of *frames* in uBufSize
-     *       (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout) on stream creation. */
-    uint32_t cFramesLive = uBufSize;
-
+    /* Prepate the format. */
     PPDMAUDIOPCMPROPS pProps = &pStreamVRDE->pCfg->Props;
-
-    VRDEAUDIOFORMAT format = VRDE_AUDIO_FMT_MAKE(pProps->uHz,
-                                                 pProps->cChannels,
-                                                 pProps->cbSample * 8 /* Bit */,
-                                                 pProps->fSigned);
-
-    /* Use the internal counter to track if we (still) can write to the VRDP server
-     * or if we need to wait another round (time slot). */
-    uint32_t cFramesToWrite = cFramesLive;
-
-    Log3Func(("cFramesLive=%RU32, cFramesToWrite=%RU32\n", cFramesLive, cFramesToWrite));
-
-    /* Don't play more than available. */
-    if (cFramesToWrite > cFramesLive)
-        cFramesToWrite = cFramesLive;
-
-    int rc = VINF_SUCCESS;
-
-    PPDMAUDIOFRAME paSampleBuf = (PPDMAUDIOFRAME)pvBuf;
-    AssertPtr(paSampleBuf);
+    VRDEAUDIOFORMAT const VrdpFormat = VRDE_AUDIO_FMT_MAKE(pProps->uHz,
+                                                           pProps->cChannels,
+                                                           pProps->cbSample * 8 /* Bit */,
+                                                           pProps->fSigned);
+
+    /* 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
+     *        server or if need to wait anothe round (time slot)".  However it
+     *        wasn't accessing any internal counter nor doing anything else
+     *        sensible, so I've removed it. */
 
     /*
      * Call the VRDP server with the data.
      */
-    uint32_t cfWritten = 0;
-    while (cFramesToWrite)
-    {
-        uint32_t cfChunk = cFramesToWrite; /** @todo For now write all at once. */
-
-        if (!cfChunk) /* Nothing to send. Bail out. */
-            break;
-
-        /* 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 + cfWritten, cfChunk /* Frames */, format);
-
-        cfWritten += cfChunk;
-        Assert(cfWritten <= cFramesLive);
-
-        Assert(cFramesToWrite >= cfChunk);
-        cFramesToWrite -= cfChunk;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        /* Return frames instead of bytes here
-         * (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout). */
-        if (puWritten)
-            *puWritten = cfWritten;
-    }
-
-    return rc;
+    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 */, VrdpFormat);
+
+        cFramesWritten += cFramesChunk;
+    }
+
+    Log3Func(("cFramesWritten=%RU32\n", cFramesWritten));
+    if (pcbWritten)
+        *pcbWritten = cFramesWritten * sizeof(PDMAUDIOFRAME);
+    return VINF_SUCCESS;
 }