Changeset 70278 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 21, 2017 1:54:17 PM (7 years ago)

Author:

vboxsync

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

119873

Message:

Audio/HDA: Implemented recording (and re-routing SDI1 to SDI0) for macOS guests.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (6 diffs)
• HDAStream.cpp (modified) (9 diffs)

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

@@ -1529 +1529 @@
 
     uint64_t cTicksToNext = pStream->State.cTransferTicks;
-
-    Log3Func(("[SD%RU8] cTicksElapsed=%RU64, cTicksTransferred=%RU64, cTicksToNext=%RU64\n",
-              pStream->u8SD, cTicksElapsed, cTicksTransferred, cTicksToNext));
-
-    Log3Func(("[SD%RU8] cbTransferProcessed=%RU32, cbTransferChunk=%RU32, cbTransferSize=%RU32\n",
-              pStream->u8SD, pStream->State.cbTransferProcessed, pStream->State.cbTransferChunk, pStream->State.cbTransferSize));
-
-    if (cTicksElapsed <= cTicksToNext)
-    {
-        cTicksToNext = cTicksToNext - cTicksElapsed;
-    }
-    else /* Catch up. */
-    {
-        Log3Func(("[SD%RU8] Warning: Lagging behind (%RU64 ticks elapsed, maximum allowed is %RU64)\n",
-                 pStream->u8SD, cTicksElapsed, cTicksToNext));
-
-        LogRelMax2(64, ("HDA: Stream #%RU8 interrupt lagging behind (expected %uus, got %uus), trying to catch up ...\n",
-                        pStream->u8SD,
-                        (TMTimerGetFreq(pThis->pTimer) / pThis->u16TimerHz) / 1000, (tsNow - pStream->State.tsTransferLast) / 1000));
-
-        cTicksToNext = 0;
-    }
-
-    Log3Func(("[SD%RU8] -> cTicksToNext=%RU64\n", pStream->u8SD, cTicksToNext));
-
-    /* Reset processed data counter. */
-    pStream->State.cbTransferProcessed = 0;
-
-    /* Re-arm the timer. */
-    hdaTimerSet(pThis, tsNow + cTicksToNext, false /* fForce */);
+    if (cTicksToNext) /* Only do any calculations if the stream currently is set up for transfers. */
+    {
+        Log3Func(("[SD%RU8] cTicksElapsed=%RU64, cTicksTransferred=%RU64, cTicksToNext=%RU64\n",
+                  pStream->u8SD, cTicksElapsed, cTicksTransferred, cTicksToNext));
+
+        Log3Func(("[SD%RU8] cbTransferProcessed=%RU32, cbTransferChunk=%RU32, cbTransferSize=%RU32\n",
+                  pStream->u8SD, pStream->State.cbTransferProcessed, pStream->State.cbTransferChunk, pStream->State.cbTransferSize));
+
+        if (cTicksElapsed <= cTicksToNext)
+        {
+            cTicksToNext = cTicksToNext - cTicksElapsed;
+        }
+        else /* Catch up. */
+        {
+            Log3Func(("[SD%RU8] Warning: Lagging behind (%RU64 ticks elapsed, maximum allowed is %RU64)\n",
+                     pStream->u8SD, cTicksElapsed, cTicksToNext));
+
+            LogRelMax2(64, ("HDA: Stream #%RU8 interrupt lagging behind (expected %uus, got %uus), trying to catch up ...\n",
+                            pStream->u8SD,
+                            (TMTimerGetFreq(pThis->pTimer) / pThis->u16TimerHz) / 1000, (tsNow - pStream->State.tsTransferLast) / 1000));
+
+            cTicksToNext = 0;
+        }
+
+        Log3Func(("[SD%RU8] -> cTicksToNext=%RU64\n", pStream->u8SD, cTicksToNext));
+
+        /* Reset processed data counter. */
+        pStream->State.cbTransferProcessed = 0;
+
+        /* Re-arm the timer. */
+        hdaTimerSet(pThis, tsNow + cTicksToNext, false /* fForce */);
+    }
 
     DEVHDA_UNLOCK_BOTH(pThis);
@@ -2481 +2483 @@
 
         AssertPtr(pSink->pMixSink);
-        LogFlowFunc(("Sink=%s, enmMixerCtl=%d\n", pSink->pMixSink->pszName, enmMixerCtl));
+        LogFlowFunc(("Sink=%s, Mixer control=%s\n", pSink->pMixSink->pszName, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
     }
     else
@@ -2564 +2566 @@
         rc = VERR_NOT_FOUND;
 
-    LogFlowFunc(("enmMixerCtl=%d, rc=%Rrc\n", enmMixerCtl, rc));
+    LogFunc(("Mixer control=%s, rc=%Rrc\n", DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), rc));
     return rc;
 }
 
 /**
- * Sets a SDn stream number and channel to a particular mixer control.
+ * Controls an input / output converter widget, that is, which converter is connected
+ * to which stream (and channel).
  *
  * @returns IPRT status code.
@@ -2581 +2584 @@
 static DECLCALLBACK(int) hdaMixerControl(PHDASTATE pThis, PDMAUDIOMIXERCTL enmMixerCtl, uint8_t uSD, uint8_t uChannel)
 {
-    LogFlowFunc(("enmMixerCtl=%RU32, uSD=%RU8, uChannel=%RU8\n", enmMixerCtl, uSD, uChannel));
+    LogFunc(("enmMixerCtl=%s, uSD=%RU8, uChannel=%RU8\n", DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), uSD, uChannel));
 
     if (uSD == 0) /* Stream number 0 is reserved. */
     {
-        LogFlowFunc(("Invalid SDn (%RU8) number for mixer control %d, ignoring\n", uSD, enmMixerCtl));
+        Log2Func(("Invalid SDn (%RU8) number for mixer control '%s', ignoring\n", uSD, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
         return VINF_SUCCESS;
     }
@@ -2594 +2597 @@
     uSD--;
 
-    int rc;
+#ifndef VBOX_WITH_AUDIO_HDA_MIC_IN
+    /* Only SDI0 (Line-In) is supported. */
+    if (   hdaGetDirFromSD(uSD) == PDMAUDIODIR_IN
+        && uSD >= 1)
+    {
+        LogRel2(("HDA: Dedicated Mic-In support not imlpemented / built-in (stream #%RU8), using Line-In (stream #0) instead\n", uSD));
+        uSD = 0;
+    }
+#endif
+
+    int rc = VINF_SUCCESS;
 
     PHDAMIXERSINK pSink = hdaMixerControlToSink(pThis, enmMixerCtl);
     if (pSink)
     {
+        AssertPtr(pSink->pMixSink);
+
+        /* If this an output stream, determine the correct SD#. */
         if (   (uSD < HDA_MAX_SDI)
             && AudioMixerSinkGetDir(pSink->pMixSink) == AUDMIXSINKDIR_OUTPUT)
@@ -2605 +2621 @@
         }
 
-        LogFlowFunc(("%s: Setting to stream ID=%RU8, channel=%RU8, enmMixerCtl=%RU32\n",
-                     pSink->pMixSink->pszName, uSD, uChannel, enmMixerCtl));
+        /* Detach the existing stream from the sink. */
+        if (   pSink->pStream
+            && (   pSink->pStream->u8SD      != uSD
+                || pSink->pStream->u8Channel != uChannel)
+           )
+        {
+            LogFunc(("Sink '%s' was assigned to stream #%RU8 (channel %RU8) before\n",
+                     pSink->pMixSink->pszName, pSink->pStream->u8SD, pSink->pStream->u8Channel));
+
+            hdaStreamLock(pSink->pStream);
+
+            /* Only disable the stream if the stream descriptor # has changed. */
+            if (pSink->pStream->u8SD != uSD)
+                hdaStreamEnable(pSink->pStream, false);
+
+            pSink->pStream->pMixSink = NULL;
+
+            hdaStreamUnlock(pSink->pStream);
+
+            pSink->pStream = NULL;
+        }
 
         Assert(uSD < HDA_MAX_STREAMS);
 
-        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
-        if (pStream)
-        {
-            hdaStreamLock(pStream);
-
-            pSink->pStream    = pStream;
-            pStream->pMixSink = pSink;
-
-            hdaStreamUnlock(pStream);
-
-            rc = VINF_SUCCESS;
-        }
-        else
-        {
-            LogRel(("HDA: Guest wanted to assign invalid stream ID=%RU8 (channel %RU8) to mixer control %RU32, skipping\n",
-                    uSD, uChannel, enmMixerCtl));
-            rc = VERR_INVALID_PARAMETER;
+        /* Attach the new stream to the sink.
+         * Enabling the stream will be done by the gust via a separate SDnCTL call then. */
+        if (pSink->pStream == NULL)
+        {
+            LogRel2(("HDA: Setting sink '%s' to stream #%RU8 (channel %RU8), mixer control=%s\n",
+                     pSink->pMixSink->pszName, uSD, uChannel, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
+
+            PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
+            if (pStream)
+            {
+                hdaStreamLock(pStream);
+
+                pSink->pStream = pStream;
+
+                pStream->u8Channel = uChannel;
+                pStream->pMixSink  = pSink;
+
+                hdaStreamUnlock(pStream);
+
+                rc = VINF_SUCCESS;
+            }
+            else
+                rc = VERR_NOT_IMPLEMENTED;
         }
     }
     else
         rc = VERR_NOT_FOUND;
+
+    if (RT_FAILURE(rc))
+        LogRel(("HDA: Converter control for stream #%RU8 (channel %RU8) / mixer control '%s' failed with %Rrc, skipping\n",
+                uSD, uChannel, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), rc));
 
     LogFlowFuncLeaveRC(rc);

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

@@ -388 +388 @@
 #endif
 
+    /* Assign the default mixer sink to the stream. */
+    pStream->pMixSink             = hdaGetDefaultSink(pThis, uSD);
+
     pStream->State.tsTransferLast = 0;
     pStream->State.tsTransferNext = 0;
@@ -442 +445 @@
     int rc = VINF_SUCCESS;
 
-    if (pStream->pMixSink) /* Stream attached to a sink? */
-    {
-        AUDMIXSINKCMD enmCmd = fEnable
-                             ? AUDMIXSINKCMD_ENABLE : AUDMIXSINKCMD_DISABLE;
-
-        /* First, enable or disable the stream and the stream's sink, if any. */
-        if (pStream->pMixSink->pMixSink)
-            rc = AudioMixerSinkCtl(pStream->pMixSink->pMixSink, enmCmd);
-
-        if (   RT_SUCCESS(rc)
-            && pStream->Dbg.Runtime.fEnabled)
-        {
-            if (fEnable)
-            {
+    if (!pStream->pMixSink) /* Stream attached to a sink? */
+    {
+        AssertMsgFailed(("Stream #%RU8 not has no mixer sink attached\n", pStream->u8SD));
+        return VERR_WRONG_ORDER;
+    }
+
+    AUDMIXSINKCMD enmCmd = fEnable
+                         ? AUDMIXSINKCMD_ENABLE : AUDMIXSINKCMD_DISABLE;
+
+    /* First, enable or disable the stream and the stream's sink, if any. */
+    if (pStream->pMixSink->pMixSink)
+        rc = AudioMixerSinkCtl(pStream->pMixSink->pMixSink, enmCmd);
+
+    if (   RT_SUCCESS(rc)
+        && pStream->Dbg.Runtime.fEnabled)
+    {
+        Assert(DrvAudioHlpPCMPropsAreValid(&pStream->State.Cfg.Props));
+
+        if (fEnable)
+        {
                 int rc2 = DrvAudioHlpFileOpen(pStream->Dbg.Runtime.pFileStream, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
                                               &pStream->State.Cfg.Props);
@@ -463 +472 @@
                                           &pStream->State.Cfg.Props);
                 AssertRC(rc2);
-            }
-            else
-            {
+        }
+        else
+        {
                 int rc2 = DrvAudioHlpFileClose(pStream->Dbg.Runtime.pFileStream);
                 AssertRC(rc2);
@@ -471 +480 @@
                 rc2 = DrvAudioHlpFileClose(pStream->Dbg.Runtime.pFileDMA);
                 AssertRC(rc2);
-            }
         }
     }
@@ -558 +566 @@
 bool hdaStreamTransferIsScheduled(PHDASTREAM pStream)
 {
-    AssertPtrReturn(pStream,            false);
+    if (!pStream)
+        return false;
+
     AssertPtrReturn(pStream->pHDAState, false);
 
@@ -819 +829 @@
     uint32_t cbProcessed = 0;
     uint32_t cbLeft      = cbToProcess;
-    Assert(cbLeft % pStream->State.cbFrameSize == 0);
 
     uint8_t abChunk[HDA_FIFO_MAX + 1];
@@ -1156 +1165 @@
 void hdaStreamUpdate(PHDASTREAM pStream, bool fInTimer)
 {
+    if (!pStream)
+        return;
+
     PAUDMIXSINK pSink = NULL;
     if (   pStream->pMixSink
@@ -1231 +1243 @@
             uint32_t cbReadable = AudioMixerSinkGetReadable(pSink);
 
-            Log3Func(("[SD%RU8] cbReadable=%RU32\n", pStream->u8SD, cbReadable));
+            /* How much (guest input) data is available for writing at the moment for the HDA stream? */
+            const uint32_t cbFree = hdaStreamGetFree(pStream);
+
+            Log3Func(("[SD%RU8] cbReadable=%RU32, cbFree=%RU32\n", pStream->u8SD, cbReadable, cbFree));
+
+            /* Do not write more than the sink can hold at the moment.
+             * The host sets the overall pace. */
+            if (cbReadable > cbFree)
+                cbReadable = cbFree;
 
             if (cbReadable)
@@ -1243 +1263 @@
                     AssertRCBreak(rc2);
 
+                    if (!cbRead)
+                    {
+                        AssertMsgFailed(("Nothing read from sink, even if %RU32 bytes were (still) announced\n", cbReadable));
+                        break;
+                    }
+
                     /* Write (guest input) data to the stream which was read from stream's sink before. */
-                    rc2 = hdaStreamWrite(pStream, abFIFO, cbRead, NULL /* pcbWritten */);
+                    uint32_t cbWritten;
+                    rc2 = hdaStreamWrite(pStream, abFIFO, cbRead, &cbWritten);
                     AssertRCBreak(rc2);
+
+                    if (!cbWritten)
+                    {
+                        AssertFailed(); /* Should never happen, as we know how much we can write. */
+                        break;
+                    }
 
                     Assert(cbReadable >= cbRead);