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

Timestamp:

Feb 1, 2017 2:37:13 PM (8 years ago)

Author:

vboxsync

Message:

Audio: Make use of pvBuf/cbBuf parameters in PDMIHOSTAUDIO::pfnStreamPlay() and PDMIHOSTAUDIO::pfnStreamCapture() to further abstract the backends from the audio connector. The backends now won't be allowed to operate on the audio connector's mixing buffers directly anymore that way.

File:

• trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (15 diffs)

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

@@ -203 +203 @@
 }
 
-static int coreAudioStreamCfgToASBD(PPDMAUDIOSTREAMCFG pCfg, AudioStreamBasicDescription *pASBD)
-{
-    AssertPtrReturn(pCfg,  VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pASBD, VERR_INVALID_PARAMETER);
-
-    PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfg, &Props);
-    if (RT_SUCCESS(rc))
-        coreAudioPCMPropsToASBD(&Props, pASBD);
-
-    return rc;
-}
-
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
 static int coreAudioASBDToStreamCfg(AudioStreamBasicDescription *pASBD, PPDMAUDIOSTREAMCFG pCfg)
@@ -408 +395 @@
     /** Pointer to driver instance this stream is bound to. */
     PDRVHOSTCOREAUDIO           pDrv;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS            Props;
     /** The stream's direction. */
     PDMAUDIODIR                 enmDir;
@@ -1624 +1613 @@
 
     /* Create the recording device's out format based on our required audio settings. */
-    int rc = coreAudioStreamCfgToASBD(pCfgReq, &pCAStream->asbdStream);
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pCAStream->Props);
     if (RT_FAILURE(rc))
     {
-        LogRel(("CoreAudio: Failed to convert requested %s format to native format (%Rrc)\n",
-                fIn ? "input" : "output", rc));
+        LogRel(("CoreAudio: Failed to convert requested %s format to native format (%Rrc)\n", fIn ? "input" : "output", rc));
         return rc;
     }
+
+    coreAudioPCMPropsToASBD(&pCAStream->Props, &pCAStream->asbdStream);
 
     coreAudioPrintASBD(  fIn
@@ -1935 +1925 @@
                                                        void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
-    RT_NOREF(pvBuf, cbBuf); /** @todo r=bird: this looks totally weird at first glance! */
-
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
@@ -1970 +1958 @@
 
     int rc = VINF_SUCCESS;
-    uint32_t csWrittenTotal = 0;
+
+    uint32_t cbReadTotal = 0;
 
     rc = RTCritSectEnter(&pCAStream->CritSect);
@@ -1977 +1966 @@
     do
     {
-        size_t cbMixBuf  = AudioMixBufSizeBytes(&pStream->MixBuf);
-        size_t cbToWrite = RT_MIN(cbMixBuf, RTCircBufUsed(pCAStream->pCircBuf));
-
-        uint32_t csWritten, cbWritten;
+        size_t cbToWrite = RT_MIN(cbBuf, RTCircBufUsed(pCAStream->pCircBuf));
 
         uint8_t *pvChunk;
         size_t   cbChunk;
 
-        Log3Func(("cbMixBuf=%zu, cbToWrite=%zu/%zu\n", cbMixBuf, cbToWrite, RTCircBufSize(pCAStream->pCircBuf)));
+        Log3Func(("cbToWrite=%zu/%zu\n", cbToWrite, RTCircBufSize(pCAStream->pCircBuf)));
 
         while (cbToWrite)
@@ -2005 +1991 @@
                     AssertFailed();
 #endif
-                rc = AudioMixBufWriteCirc(&pStream->MixBuf, pvChunk, cbChunk, &csWritten);
-                if (rc == VERR_BUFFER_OVERFLOW)
-                {
-                    LogRel2(("Core Audio: Capturing host buffer full\n"));
-                    rc = VINF_SUCCESS;
-                }
+                memcpy((uint8_t *)pvBuf + cbReadTotal, pvChunk, cbChunk);
             }
 
@@ -2019 +2000 @@
                 break;
 
-            cbWritten = AUDIOMIXBUF_S2B(&pStream->MixBuf, csWritten);
-
-            Assert(cbToWrite >= cbWritten);
-            cbToWrite      -= cbWritten;
-
-            csWrittenTotal += csWritten;
+            Assert(cbToWrite >= cbChunk);
+            cbToWrite      -= cbChunk;
+
+            cbReadTotal    += cbChunk;
         }
     }
@@ -2032 +2011 @@
     AssertRC(rc2);
 
-#ifdef LOG_ENABLED
-    uint32_t cbWrittenTotal = AUDIOMIXBUF_S2B(&pStream->MixBuf, csWrittenTotal);
-    Log3Func(("csWrittenTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", csWrittenTotal, cbWrittenTotal, rc));
-#endif
-
     if (RT_SUCCESS(rc))
     {
-        uint32_t csMixed = 0;
-
-        if (csWrittenTotal)
-            rc = AudioMixBufMixToParent(&pStream->MixBuf, csWrittenTotal, &csMixed);
-
-        Log3Func(("csMixed=%RU32\n", csMixed));
-
         if (pcbRead)
-            *pcbRead = csMixed;
-    }
-
-    if (RT_FAILURE(rc))
-        LogFunc(("Failed with rc=%Rrc\n", rc));
+            *pcbRead = cbReadTotal;
+    }
 
     return rc;
@@ -2063 +2027 @@
                                                     uint32_t *pcbWritten)
 {
-    RT_NOREF(pvBuf, cbBuf);
-
     PDRVHOSTCOREAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
     PCOREAUDIOSTREAM  pCAStream = (PCOREAUDIOSTREAM)pStream;
@@ -2093 +2055 @@
     }
 
-    uint32_t cLive = AudioMixBufLive(&pStream->MixBuf);
-    if (!cLive) /* Not live samples to play? Bail out. */
-    {
-        if (pcbWritten)
-            *pcbWritten = 0;
-        return VINF_SUCCESS;
-    }
-
-    size_t cbLive  = AUDIOMIXBUF_S2B(&pStream->MixBuf, cLive);
-
-    uint32_t cbReadTotal = 0;
+    uint32_t cbWrittenTotal = 0;
 
     int rc = VINF_SUCCESS;
@@ -2110 +2062 @@
     AssertRC(rc);
 
-    size_t cbToRead = RT_MIN(cbLive, RTCircBufFree(pCAStream->pCircBuf));
-    Log3Func(("cbLive=%zu, cbToRead=%zu\n", cbLive, cbToRead));
+    size_t cbToWrite = RT_MIN(cbBuf, RTCircBufFree(pCAStream->pCircBuf));
+    Log3Func(("cbToWrite=%zu\n", cbToWrite));
 
     uint8_t *pvChunk;
     size_t   cbChunk;
 
-    while (cbToRead)
-    {
-        uint32_t cRead, cbRead;
-
+    while (cbToWrite)
+    {
         /* Try to acquire the necessary space from the ring buffer. */
-        RTCircBufAcquireWriteBlock(pCAStream->pCircBuf, cbToRead, (void **)&pvChunk, &cbChunk);
+        RTCircBufAcquireWriteBlock(pCAStream->pCircBuf, cbToWrite, (void **)&pvChunk, &cbChunk);
         if (!cbChunk)
         {
@@ -2128 +2078 @@
         }
 
-        Assert(cbChunk <= cbToRead);
-
-        rc = AudioMixBufReadCirc(&pStream->MixBuf, pvChunk, cbChunk, &cRead);
-
-        cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead);
+        Assert(cbChunk <= cbToWrite);
+        Assert(cbWrittenTotal + cbChunk <= cbBuf);
+
+        memcpy((uint8_t *)pvBuf + cbWrittenTotal, pvChunk, cbChunk);
 
         /* Release the ring buffer, so the read thread could start reading this data. */
@@ -2140 +2089 @@
             break;
 
-        Assert(cbToRead >= cbRead);
-        cbToRead -= cbRead;
-        cbReadTotal += cbRead;
+        Assert(cbToWrite >= cbChunk);
+        cbToWrite      -= cbChunk;
+
+        cbWrittenTotal += cbChunk;
     }
 
@@ -2163 +2113 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pStream->MixBuf, cbReadTotal);
-        if (cReadTotal)
-            AudioMixBufFinish(&pStream->MixBuf, cReadTotal);
-
-        Log3Func(("cReadTotal=%RU32 (%RU32 bytes)\n", cReadTotal, cbReadTotal));
-
         if (pcbWritten)
-            *pcbWritten = cReadTotal;
+            *pcbWritten = cbWrittenTotal;
     }