Changeset 65660 in vbox for trunk/src/VBox/Devices

Timestamp:

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

Author:

vboxsync

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

113352

Message:

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

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (6 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);