Changeset 65660 in vbox for trunk/src

Timestamp:

Feb 7, 2017 1:53:14 PM (8 years ago)

Author:

vboxsync

Message:

Audio: Added PDMAUDIOSTREAMLAYOUT_RAW to pass the raw audio data to the VRDP backend.

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvAudio.cpp (modified) (6 diffs)
• Main/src-client/DrvAudioVRDE.cpp (modified) (7 diffs)

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

@@ -599 +599 @@
                                       PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    AssertPtrReturn(pThis,     VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream,   VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgHost,  VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgGuest, VERR_INVALID_POINTER);
 
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
@@ -609 +611 @@
      * Init host stream.
      */
+
+    /* Set the host's default audio data layout. */
+    pCfgHost->enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
 #ifdef DEBUG
@@ -631 +636 @@
 #else
     LogRel2(("Audio: Acquired %s host format for '%s': %RU32Hz, %RU8%s, %RU8 %s\n",
-             pCfgGuest->enmDir == PDMAUDIODIR_IN ? "recording" : "playback",  pStream->szName,
-             pCfgHost->Props.uHz, pCfgHost->Props.cBits, pCfgHost->Props.fSigned ? "S" : "U",
+             CfgHostAcq.enmDir == PDMAUDIODIR_IN ? "recording" : "playback",  pStream->szName,
+             CfgHostAcq.Props.uHz, CfgHostAcq.Props.cBits, CfgHostAcq.Props.fSigned ? "S" : "U",
              CfgHostAcq.Props.cChannels, CfgHostAcq.Props.cChannels == 0 ? "Channel" : "Channels"));
 #endif
@@ -658 +663 @@
 
     /* Make a copy of the acquired host stream configuration. */
-    rc2 = DrvAudioHlpStreamCfgCopy(&pHstStream->Cfg, pCfgHost);
+    rc2 = DrvAudioHlpStreamCfgCopy(&pHstStream->Cfg, &CfgHostAcq);
     AssertRC(rc2);
 
@@ -667 +672 @@
     /* Destroy any former mixing buffer. */
     AudioMixBufDestroy(&pGstStream->MixBuf);
+
+    /* Set the guests's default audio data layout. */
+    pCfgHost->enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
     /* Make sure to (re-)set the guest buffer's shift size. */
@@ -1305 +1313 @@
             && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
         {
-            uint8_t u8Buf[_4K]; /** @todo Get rid of this here. */
-
-            uint32_t cRead = 0;
-            int rc2 = AudioMixBufReadCirc(&pHstStream->MixBuf, u8Buf, sizeof(u8Buf), &cRead);
-            AssertRC(rc2);
-
-            uint32_t cbBuf = AUDIOMIXBUF_S2B(&pHstStream->MixBuf, cRead);
             uint32_t cbPlayed = 0;
 
             AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
-            rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend, u8Buf, cbBuf, &cbPlayed);
+
+            if (RT_LIKELY(pHstStream->Cfg.enmLayout == PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED))
+            {
+                uint8_t u8Buf[_4K]; /** @todo Get rid of this here. */
+
+                uint32_t csRead = 0;
+                int rc2 = AudioMixBufReadCirc(&pHstStream->MixBuf, u8Buf, sizeof(u8Buf), &csRead);
+                AssertRC(rc2);
+
+                rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                         u8Buf, AUDIOMIXBUF_S2B(&pHstStream->MixBuf, csRead),
+                                                         &cbPlayed);
+                AssertMsg(cbPlayed % 2 == 0,
+                          ("Backend for stream '%s' returned uneven played bytes count (csRead=%RU32, cbPlayed=%RU32)\n",
+                           pHstStream->szName, csRead, cbPlayed));
+
+                csPlayed = AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
+            }
+            else if (pHstStream->Cfg.enmLayout == PDMAUDIOSTREAMLAYOUT_RAW)
+            {
+                PDMAUDIOSAMPLE aSampleBuf[128]; /** @todo Get rid of this here. */
+
+                uint32_t csRead = 0;
+                int rc2 = AudioMixBufPeek(&pHstStream->MixBuf, csLive, aSampleBuf,
+                                          RT_MIN(csLive, RT_ELEMENTS(aSampleBuf)), &csRead);
+                AssertRC(rc2);
+
+                Assert(csRead <= RT_ELEMENTS(aSampleBuf));
+
+                rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                         aSampleBuf, csRead, &csPlayed);
+            }
+            else
+                AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
+
             if (RT_SUCCESS(rc))
             {
-                AssertMsg(cbPlayed % 2 == 0,
-                          ("Backend for stream '%s' returned uneven played bytes count (%RU32)\n", pHstStream->szName, cbPlayed));
-
-                csPlayed = AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
-
                 AudioMixBufFinish(&pHstStream->MixBuf, csPlayed);
 

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

@@ -82 +82 @@
 } VRDESTREAM, *PVRDESTREAM;
 
+/* Sanity. */
+AssertCompileSize(PDMAUDIOSAMPLE, sizeof(int64_t) * 2 /* st_sample_t using by VRDP server */);
 
 static int vrdeCreateStreamIn(PVRDESTREAM pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
@@ -91 +93 @@
     {
         if (pCfgAcq)
+        {
+            /*
+             * Because of historical reasons the VRDP server operates on st_sample_t structures internally,
+             * which is 2 * int64_t for left/right (stereo) channels.
+             *
+             * As the audio connector also uses this format, set the layout to "raw" and just let pass through
+             * the data without any layout modification needed.
+             */
+            pCfgAcq->enmLayout         = PDMAUDIOSTREAMLAYOUT_RAW;
             pCfgAcq->cSampleBufferHint = pStreamVRDE->In.cSamplesMax;
+        }
     }
 
@@ -103 +115 @@
 
     if (pCfgAcq)
+    {
+        /*
+         * Because of historical reasons the VRDP server operates on st_sample_t structures internally,
+         * which is 2 * int64_t for left/right (stereo) channels.
+         *
+         * As the audio connector also uses this format, set the layout to "raw" and just let pass through
+         * the data without any layout modification needed.
+         */
+        pCfgAcq->enmLayout         = PDMAUDIOSTREAMLAYOUT_RAW;
         pCfgAcq->cSampleBufferHint = _4K; /** @todo Make this configurable. */
+    }
 
     return VINF_SUCCESS;
@@ -241 +263 @@
     PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
 
-    uint32_t cbLive           = cbBuf;
+    /* Note: We get the number of *samples* in cbBuf
+     *       (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout) on stream creation. */
+    uint32_t csLive           = cbBuf;
 
     uint64_t now              = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
@@ -250 +274 @@
 
     /* Minimize the rounding error: samples = int((ticks * freq) / ticks_per_second + 0.5). */
-    uint32_t cbToWrite = (int)((2 * ticks * pProps->uHz + ticks_per_second) / ticks_per_second / 2);
+    uint32_t csToWrite = (int)((2 * ticks * pProps->uHz + ticks_per_second) / ticks_per_second / 2);
 
     /* Remember when samples were consumed. */
@@ -260 +284 @@
                                                  pProps->fSigned);
 
-    Log2Func(("uFreq=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool, enmFormat=%ld, cbLive=%RU32, cbToWrite=%RU32\n",
-              pProps->uHz,   pProps->cChannels, pProps->cBits, pProps->fSigned, format, cbLive, cbToWrite));
+    Log3Func(("uFreq=%RU32, cChan=%RU8, cBits=%RU8 (%d BPP), fSigned=%RTbool, enmFormat=%ld, csLive=%RU32, csToWrite=%RU32\n",
+              pProps->uHz, pProps->cChannels, pProps->cBits, VRDE_AUDIO_FMT_BYTES_PER_SAMPLE(format),
+              pProps->fSigned, format, csLive, csToWrite));
 
     /* Don't play more than available. */
-    if (cbToWrite > cbLive)
-        cbToWrite = cbLive;
+    if (csToWrite > csLive)
+        csToWrite = csLive;
 
     int rc = VINF_SUCCESS;
@@ -272 +297 @@
      * Call the VRDP server with the data.
      */
-    uint32_t cbWritten = 0;
-    while (cbToWrite)
-    {
-        /* Make sure that this is even, as we send the number of samples to the VRDP server. */
-        uint32_t cbChunk = (cbToWrite % 2 == 0) ? cbToWrite : cbToWrite - 1; /** @todo For now write all at once. */
-        Assert(cbChunk % 2 == 0);
-
-        if (!cbChunk) /* Nothing to send. Bail out. */
+    uint32_t csWritten = 0;
+    while (csToWrite)
+    {
+        uint32_t csChunk = csToWrite; /** @todo For now write all at once. */
+
+        if (!csChunk) /* Nothing to send. Bail out. */
             break;
 
-        pDrv->pConsoleVRDPServer->SendAudioSamples((uint8_t *)pvBuf + cbWritten,
-                                                   PDMAUDIOSTREAMCFG_B2S(pStreamVRDE->pCfg, cbChunk) /* Samples */, format);
-        cbWritten += cbChunk;
-        Assert(cbWritten <= cbBuf);
-
-        Assert(cbToWrite >= cbChunk);
-        cbToWrite -= cbChunk;
+        /* 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((PPDMAUDIOSAMPLE)pvBuf + csWritten, csChunk /* Samples */, format);
+
+        csWritten += csChunk;
+        Assert(csWritten <= csLive);
+
+        Assert(csToWrite >= csChunk);
+        csToWrite -= csChunk;
     }
 
     if (RT_SUCCESS(rc))
     {
-        Assert(cbWritten % 2 == 0); /* Paranoia. */
-
+        /* Return samples instead of bytes here
+         * (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout). */
         if (pcbWritten)
-            *pcbWritten = cbWritten;
+            *pcbWritten = csWritten;
     }