Changeset 61723 in vbox

Timestamp:

Jun 15, 2016 3:21:15 PM (9 years ago)

Author:

vboxsync

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

108093

Message:

Audio: Fixes for recording on Windows hosts.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (4 diffs)
• DevIchHda.cpp (modified) (7 diffs)
• DrvHostDSound.cpp (modified) (10 diffs)

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

@@ -385 +385 @@
                  pSink->pszName, fFlags, pCfg->enmDir, DrvAudioHlpAudFmtToStr(pCfg->enmFormat), pCfg->cChannels, pCfg->uHz));
 
-    PDMAUDIOSTREAMCFG CfgSink;
-    int rc = DrvAudioHlpPCMPropsToStreamCfg(&pSink->PCMProps, &CfgSink);
+    /*
+     * Initialize the host-side configuration for the stream to be created.
+     * Always use the sink's PCM audio format as the host side when creating a stream for it.
+     */
+    PDMAUDIOSTREAMCFG CfgHost;
+    int rc = DrvAudioHlpPCMPropsToStreamCfg(&pSink->PCMProps, &CfgHost);
     AssertRCReturn(rc, rc);
 
@@ -393 +397 @@
     if (pSink->enmDir == AUDMIXSINKDIR_INPUT)
     {
-        CfgSink.DestSource.Source = PDMAUDIORECSOURCE_UNKNOWN;
-        CfgSink.enmDir            = PDMAUDIODIR_IN;
+        CfgHost.DestSource.Source = pCfg->DestSource.Source;
+        CfgHost.enmDir            = PDMAUDIODIR_IN;
     }
     else
     {
-        CfgSink.DestSource.Dest = PDMAUDIOPLAYBACKDEST_UNKNOWN;
-        CfgSink.enmDir          = PDMAUDIODIR_OUT;
-    }
-
-    RTStrPrintf(CfgSink.szName, sizeof(CfgSink.szName), "%s", pCfg->szName);
-
-    /* Always use the sink's PCM audio format as the host side when creating a stream for it. */
+        CfgHost.DestSource.Dest = pCfg->DestSource.Dest;
+        CfgHost.enmDir          = PDMAUDIODIR_OUT;
+    }
+
+    RTStrPrintf(CfgHost.szName, sizeof(CfgHost.szName), "%s", pCfg->szName);
+
     PPDMAUDIOSTREAM pStream;
-    rc = pConn->pfnStreamCreate(pConn, &CfgSink, pCfg, &pStream);
+    rc = pConn->pfnStreamCreate(pConn, &CfgHost, pCfg, &pStream);
     if (RT_SUCCESS(rc))
     {
@@ -1061 +1064 @@
     LogFlowFunc(("%s: enmOp=%ld, cbBuf=%RU32\n", pSink->pszName, enmOp, cbBuf));
 
-    uint32_t cPlayed;
     uint32_t cbProcessed;
 
@@ -1179 +1181 @@
 
     bool fIsActive =
-        (pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED);
+        RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED);
 
     return fIsActive;

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

@@ -2687 +2687 @@
         if (fUseFront)
         {
-            if (!RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Front"))
-            {
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
-
+            RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Front");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
             pCfg->cChannels       = 2;
+
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_FRONT);
             if (RT_SUCCESS(rc))
@@ -2704 +2700 @@
             && (fUseCenter || fUseLFE))
         {
-            if (!RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Center/LFE"))
-            {
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
-
+            RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Center/LFE");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_CENTER_LFE;
             pCfg->cChannels       = (fUseCenter && fUseLFE) ? 2 : 1;
+
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_CENTER_LFE);
             if (RT_SUCCESS(rc))
@@ -2720 +2712 @@
             && fUseRear)
         {
-            if (!RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Rear"))
-            {
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
-
+            RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Rear");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_REAR;
             pCfg->cChannels       = 2;
+
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_REAR);
             if (RT_SUCCESS(rc))
@@ -2812 +2800 @@
 #else
             strmCfg.DestSource.Source = PDMAUDIORECSOURCE_LINE;
+            RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Line In");
 #endif
             break;
@@ -3787 +3776 @@
     {
         int rc2 = VINF_SUCCESS;
-        PHDAMIXERSTREAM pStream;
+        PHDAMIXERSTREAM pStream = NULL;
 
         if (pCfg->enmDir == PDMAUDIODIR_IN)
         {
+            LogFunc(("enmRecSource=%ld\n", pCfg->DestSource.Source));
+
             switch (pCfg->DestSource.Source)
             {
@@ -3808 +3799 @@
         else if (pCfg->enmDir == PDMAUDIODIR_OUT)
         {
+            LogFunc(("enmPlaybackDest=%ld\n", pCfg->DestSource.Dest));
+
             switch (pCfg->DestSource.Dest)
             {
@@ -3831 +3824 @@
         if (RT_SUCCESS(rc2))
         {
+            AssertPtr(pStream);
+
             AudioMixerSinkRemoveStream(pSink->pMixSink, pStream->pMixStrm);
 

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

@@ -894 +894 @@
     AssertPtrReturn(pDSoundStream, NULL);
 
+    int rc = VINF_SUCCESS;
+
     LPCGUID pGUID = pThis->cfg.pGuidCapture;
-
     if (!pGUID)
     {
-        PDSOUNDDEV  pDev = NULL;
+        PDSOUNDDEV pDev = NULL;
 
         switch (pDSoundStream->enmRecSource)
         {
+            case PDMAUDIORECSOURCE_LINE:
+                /*
+                 * At the moment we're only supporting line-in in the HDA emulation,
+                 * and line-in + mic-in in the AC'97 emulation both are expected
+                 * to use the host's mic-in as well.
+                 *
+                 * So the fall through here is intentional for now.
+                 */
             case PDMAUDIORECSOURCE_MIC:
             {
@@ -909 +918 @@
                         break;
                 }
+
                 if (RTListNodeIsDummy(&pThis->lstDevInput, pDev, DSOUNDDEV, Node))
-                    pDev = NULL;    /* Found nothing. */
+                    pDev = NULL; /* Found nothing. */
 
                 break;
             }
 
-            case PDMAUDIORECSOURCE_LINE:
             default:
-                /* Try opening the default device (NULL). */
+                AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
                 break;
         }
 
-        if (pDev)
-        {
-            DSLOG(("DSound: Guest \"%s\" is using host \"%s\"\n",
+        if (   RT_SUCCESS(rc)
+            && pDev)
+        {
+            DSLOG(("DSound: Guest source '%s' is using host recording device '%s'\n",
                    DrvAudioHlpRecSrcToStr(pDSoundStream->enmRecSource), pDev->pszName));
 
@@ -930 +940 @@
     }
 
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("DSound: Selecting recording device failed with %Rrc\n", rc));
+        return NULL;
+    }
+
     char *pszGUID = dsoundGUIDToUtf8StrA(pGUID);
+
     /* This always has to be in the release log. */
-    LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
+    LogRel(("DSound: Guest source '%s' is using host recording device with GUID '%s'\n",
             DrvAudioHlpRecSrcToStr(pDSoundStream->enmRecSource), pszGUID ? pszGUID: "{?}"));
-    RTStrFree(pszGUID);
+
+    if (pszGUID)
+    {
+        RTStrFree(pszGUID);
+        pszGUID = NULL;
+    }
 
     return pGUID;
@@ -1423 +1445 @@
     LogFlowFunc(("pStream=%p, pCfg=%p\n", pStream, pCfg));
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDRVHOSTDSOUND   pThis         = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
     PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
 
@@ -1663 +1685 @@
 static int dsoundDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
 {
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDRVHOSTDSOUND   pThis         = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
     PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
 
     directSoundPlayClose(pThis, pDSoundStream);
 
-    pDSoundStream->cbPlayWritePos = 0;
-    pDSoundStream->fRestartPlayback = true;
+    pDSoundStream->cbPlayWritePos       = 0;
+    pDSoundStream->fRestartPlayback     = true;
     pDSoundStream->csPlaybackBufferSize = 0;
 
@@ -1680 +1702 @@
                                 PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfg, uint32_t *pcSamples)
 {
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,       VERR_INVALID_POINTER);
+
+    PDRVHOSTDSOUND  pThis         = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
     PDSOUNDSTREAMIN pDSoundStream = (PDSOUNDSTREAMIN)pStream;
 
-    LogFlowFunc(("pStream=%p, pAudioSettings=%p, enmRecSource=%ld\n",
-                 pStream, pCfg, pCfg->DestSource.Source));
-
-    pDSoundStream->streamCfg = *pCfg;
-    pDSoundStream->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
+    LogFlowFunc(("pStream=%p, pCfg=%p, enmRecSource=%ld\n", pStream, pCfg, pCfg->DestSource.Source));
+
+    memcpy(&pDSoundStream->streamCfg, pCfg, sizeof(PDMAUDIOSTREAMCFG));
 
     /** @todo caller should already init Props? */
@@ -1720 +1744 @@
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
     LogFlowFunc(("pStream=%p, enmStreamCmd=%ld\n", pStream, enmStreamCmd));
@@ -1821 +1845 @@
             break;
 
-        /* Using as an intermediate not circular buffer. */
-        AudioMixBufReset(&pStream->MixBuf);
-
         /* Get number of free samples in the mix buffer and check that is has free space */
         uint32_t csMixFree = AudioMixBufFree(&pStream->MixBuf);
@@ -1859 +1880 @@
         if (pv1 && len1)
         {
-            rc = AudioMixBufWriteAt(&pStream->MixBuf, 0 /* offWrite */,
-                                    pv1, cb1, &csWritten);
+            rc = AudioMixBufWriteCirc(&pStream->MixBuf, pv1, cb1, &csWritten);
             if (RT_SUCCESS(rc))
                 csWrittenTotal += csWritten;
@@ -1869 +1889 @@
             && pv2 && len2)
         {
-            rc = AudioMixBufWriteAt(&pStream->MixBuf, csWrittenTotal,
-                                    pv2, cb2, &csWritten);
+            rc = AudioMixBufWriteCirc(&pStream->MixBuf, pv2, cb2, &csWritten);
             if (RT_SUCCESS(rc))
                 csWrittenTotal += csWritten;