Changeset 53562 in vbox for trunk/src/VBox

Timestamp:

Dec 17, 2014 3:37:22 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: First working version of the OSS backend.

File:

• trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (12 diffs)

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

@@ -72 +72 @@
     int                cFragments;
     int                cbFragmentSize;
-    void              *pvPCMBuf;
+    void              *pvBuf;
+    size_t             cbBuf;
     int                old_optr;
 } OSSAUDIOSTREAMIN, *POSSAUDIOSTREAMIN;
@@ -412 +413 @@
                                                   uint32_t *pcSamplesCaptured)
 {
-    *pcSamplesCaptured = 0;
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) drvHostOSSAudioFiniIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn)
-{
     NOREF(pInterface);
     AssertPtrReturn(pHstStrmIn, VERR_INVALID_POINTER);
@@ -423 +418 @@
     POSSAUDIOSTREAMIN pThisStrmIn = (POSSAUDIOSTREAMIN)pHstStrmIn;
 
+    int rc = VINF_SUCCESS;
+    size_t cbToRead = RT_MIN(pThisStrmIn->cbBuf, 
+                             audioMixBufFreeBytes(&pHstStrmIn->MixBuf));
+
+    LogFlowFunc(("cbToRead=%zu\n", cbToRead));
+
+    uint32_t cWrittenTotal = 0;
+    uint32_t cbTemp;
+    ssize_t  cbRead;
+    size_t   offWrite = 0;
+
+    while (cbToRead) 
+    {
+        cbTemp = RT_MIN(cbToRead, pThisStrmIn->cbBuf);
+        AssertBreakStmt(cbTemp, rc = VERR_NO_DATA);
+        cbRead = read(pThisStrmIn->hFile, pThisStrmIn->pvBuf + offWrite, cbTemp);
+
+        LogFlowFunc(("cbRead=%zi, cbTemp=%RU32, cbToRead=%zu\n",
+                     cbRead, cbTemp, cbToRead));
+
+        if (cbRead < 0) 
+        {
+            switch (errno) 
+            {
+                case 0:
+                {
+                    LogFunc(("Failed to read %z frames\n", cbRead));
+                    rc = VERR_ACCESS_DENIED;
+                    break;
+                }
+
+                case EINTR:
+                case EAGAIN:
+                    rc = VERR_NO_DATA;
+                    break;
+
+                default:
+                    LogFlowFunc(("Failed to read %zu input frames, rc=%Rrc\n", 
+                                 cbTemp, rc));
+                    rc = VERR_GENERAL_FAILURE; /** @todo */
+                    break;
+            }
+
+            if (RT_FAILURE(rc))
+                break;
+        }
+        else if (cbRead)
+        {
+            uint32_t cWritten;  
+            rc = audioMixBufWriteCirc(&pHstStrmIn->MixBuf, 
+                                      pThisStrmIn->pvBuf, cbRead,
+                                      &cWritten);
+            if (RT_FAILURE(rc))
+                break;
+
+            uint32_t cbWritten = AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, cWritten);
+
+            Assert(cbToRead >= cbWritten);
+            cbToRead      -= cbWritten;
+            offWrite      += cbWritten;
+            cWrittenTotal += cWritten;
+        }
+        else /* No more data, try next round. */
+            break;
+    }
+
+    if (rc == VERR_NO_DATA)
+        rc = VINF_SUCCESS;
+
+    if (RT_SUCCESS(rc))
+    {
+        uint32_t cProcessed = 0;
+        if (cWrittenTotal)
+            rc = audioMixBufMixToParent(&pHstStrmIn->MixBuf, cWrittenTotal,
+                                        &cProcessed);
+
+        if (pcSamplesCaptured)
+            *pcSamplesCaptured = cWrittenTotal;
+
+        LogFlowFunc(("cWrittenTotal=%RU32 (%RU32 processed), rc=%Rrc\n",
+                     cWrittenTotal, cProcessed, rc));
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+static DECLCALLBACK(int) drvHostOSSAudioFiniIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn)
+{
+    NOREF(pInterface);
+    AssertPtrReturn(pHstStrmIn, VERR_INVALID_POINTER);
+
+    POSSAUDIOSTREAMIN pThisStrmIn = (POSSAUDIOSTREAMIN)pHstStrmIn;
+
     LogFlowFuncEnter();
 
-    RTMemFree(pThisStrmIn->pvPCMBuf);
-    pThisStrmIn->pvPCMBuf = NULL;
+    if (pThisStrmIn->pvBuf) 
+    {
+        RTMemFree(pThisStrmIn->pvBuf);
+        pThisStrmIn->pvBuf = NULL;
+    }
 
     return VINF_SUCCESS;
@@ -443 +535 @@
     if (!pThisStrmOut->fMemMapped) 
     {
-        RTMemFree(pThisStrmOut->pvPCMBuf);
-        pThisStrmOut->pvPCMBuf = NULL;
+        if (pThisStrmOut->pvPCMBuf) 
+        {
+            RTMemFree(pThisStrmOut->pvPCMBuf);
+            pThisStrmOut->pvPCMBuf = NULL;
+        }
     }
 #endif
@@ -509 +604 @@
             {
                 cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) 
-                           >> pHstStrmIn->Props.cShift;  
+                           >> pHstStrmIn->Props.cShift;
+                if (!cSamples)
+                    rc = VERR_INVALID_PARAMETER;
             }
         }
@@ -515 +612 @@
         if (RT_SUCCESS(rc)) 
         {
-            pThisStrmIn->pvPCMBuf = RTMemAlloc(cSamples * (1 << pHstStrmIn->Props.cShift));
-            if (!pThisStrmIn->pvPCMBuf) 
+            size_t cbBuf = cSamples * (1 << pHstStrmIn->Props.cShift);
+            pThisStrmIn->pvBuf = RTMemAlloc(cbBuf);
+            if (!pThisStrmIn->pvBuf) 
             {
                 LogRel(("Audio: Failed allocating ADC buffer with %RU32 samples, each %d bytes\n",
@@ -522 +620 @@
                 rc = VERR_NO_MEMORY;
             }
+
+            pThisStrmIn->cbBuf = cbBuf;
 
             if (pcSamples)
@@ -579 +679 @@
             rc = drvAudioStreamCfgToProps(&streamCfg, &pHstStrmOut->Props);
             if (RT_SUCCESS(rc)) 
-            {
                 cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) 
                            >> pHstStrmOut->Props.cShift;  
-            }
         }
 
@@ -643 +741 @@
             {
 #endif
+                LogFlowFunc(("cSamples=%RU32\n", cSamples));
                 pThisStrmOut->pvPCMBuf = RTMemAlloc(cSamples * (1 << pHstStrmOut->Props.cShift));
                 if (!pThisStrmOut->pvPCMBuf) 
@@ -649 +748 @@
                             cSamples, 1 << pHstStrmOut->Props.cShift));
                     rc = VERR_NO_MEMORY;
+                    break;
                 }
-
-                break;
 #ifndef RT_OS_L4
             }
@@ -720 +818 @@
             audio_buf_info abinfo;
             int rc2 = ioctl(pThisStrmOut->hFile, SNDCTL_DSP_GETOSPACE, &abinfo);
-            if (!rc2) 
+            if (rc2 < 0) 
             {
                 LogRel(("Audio: Failed to retrieve current playback buffer: %s\n", 
@@ -788 +886 @@
     } while(0);
 
-    uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cbReadTotal);
-    if (cReadTotal)
-        audioMixBufFinish(&pHstStrmOut->MixBuf, cReadTotal);
-
-    if (pcSamplesPlayed)
-        *pcSamplesPlayed = cReadTotal;
-
-    LogFlowFunc(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", 
-                 cReadTotal, cbReadTotal, rc));
+    if (RT_SUCCESS(rc)) 
+    {
+        uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cbReadTotal);
+        if (cReadTotal)
+            audioMixBufFinish(&pHstStrmOut->MixBuf, cReadTotal);
+
+        if (pcSamplesPlayed)
+            *pcSamplesPlayed = cReadTotal;
+
+        LogFlowFunc(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", 
+                     cReadTotal, cbReadTotal, rc));
+    }
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }