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

Timestamp:

Sep 3, 2018 10:03:11 AM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Compile fixes for async I/O support (VBOX_WITH_AUDIO_AC97_ASYNC_IO, currently not enabled), matched the timer / async I/O threading code with the one in the HDA emulation.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (7 diffs)

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

@@ -666 +666 @@
 static void               ichac97R3StreamAsyncIOLock(PAC97STREAM pStream);
 static void               ichac97R3StreamAsyncIOUnlock(PAC97STREAM pStream);
-static void               ichac97R3StreamAsyncIOEnable(PAC97STREAM pStream, bool fEnable);
+/*static void               ichac97R3StreamAsyncIOEnable(PAC97STREAM pStream, bool fEnable); Unused */
 # endif
 
@@ -1298 +1298 @@
                 RTStrPrintf2(szThreadName, sizeof(szThreadName), "ac97AIO%RU8", pStream->u8SD);
 
-                rc = RTThreadCreate(&pAIO->Thread, ichac97StreamAsyncIOThread, &Ctx,
+                rc = RTThreadCreate(&pAIO->Thread, ichac97R3StreamAsyncIOThread, &Ctx,
                                     0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, szThreadName);
                 if (RT_SUCCESS(rc))
@@ -1399 +1399 @@
 }
 
+#if 0 /* Unused */
 /**
  * Enables (resumes) or disables (pauses) the async I/O thread.
@@ -1412 +1413 @@
     ASMAtomicXchgBool(&pAIO->fEnabled, fEnable);
 }
+#endif
 
 # endif /* VBOX_WITH_AUDIO_AC97_ASYNC_IO */
@@ -1479 +1481 @@
         if (fDoRead)
         {
-            rc2 = ichac97R3StreamAsyncIONotify(pStream);
+            rc2 = ichac97R3StreamAsyncIONotify(pThis, pStream);
             AssertRC(rc2);
         }
@@ -1513 +1515 @@
     {
 # ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-        if (fInTimer)
-        {
-            rc2 = ichac97R3StreamAsyncIONotify(pThis, pStream);
-            AssertRC(rc2);
-        }
-        else
+        if (!fInTimer)
+        {
 # endif
-        {
             rc2 = AudioMixerSinkUpdate(pSink);
             AssertRC(rc2);
 
             /* Is the sink ready to be read (host input data) from? If so, by how much? */
-            const uint32_t cbReadable = AudioMixerSinkGetReadable(pSink);
-
-            /* How much (guest input) data is free at the moment? */
-            uint32_t cbToTransfer = ichac97R3StreamGetFree(pStream);
-
-            Log3Func(("[SD%RU8] cbReadable=%RU32, cbFree=%RU32\n", pStream->u8SD, cbReadable, cbToTransfer));
+            uint32_t cbSinkReadable = AudioMixerSinkGetReadable(pSink);
+
+            /* How much (guest input) data is available for writing at the moment for the AC'97 stream? */
+            uint32_t cbStreamFree = ichac97R3StreamGetFree(pStream);
+
+            Log3Func(("[SD%RU8] cbSinkReadable=%RU32, cbStreamFree=%RU32\n", pStream->u8SD, cbSinkReadable, cbStreamFree));
 
             /* Do not read more than the sink can provide at the moment.
              * The host sets the overall pace. */
-            if (cbToTransfer > cbReadable)
-                cbToTransfer = cbReadable;
-
-            if (cbToTransfer)
+            if (cbSinkReadable > cbStreamFree)
+                cbSinkReadable = cbStreamFree;
+
+            if (cbSinkReadable)
             {
                 /* Write (guest input) data to the stream which was read from stream's sink before. */
-                rc2 = ichac97R3StreamWrite(pThis, pStream, pSink, cbToTransfer, NULL /* pcbWritten */);
+                rc2 = ichac97R3StreamWrite(pThis, pStream, pSink, cbSinkReadable, NULL /* pcbWritten */);
                 AssertRC(rc2);
             }
-        }
-
 # ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-        if (fInTimer)
+        }
+        else /* fInTimer */
+        {
 # endif
-        {
-            const uint32_t cbToTransfer = ichac97R3StreamGetUsed(pStream);
-            if (cbToTransfer)
+
+# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
+            const uint64_t tsNowNs = RTTimeNanoTS();
+            if (tsNowNs - pStream->State.tsLastUpdateNs >= pStream->State.Cfg.Device.uSchedulingHintMs * RT_NS_1MS)
+            {
+                rc2 = ichac97R3StreamAsyncIONotify(pThis, pStream);
+                AssertRC(rc2);
+
+                pStream->State.tsLastUpdateNs = tsNowNs;
+            }
+# endif
+
+            const uint32_t cbStreamUsed = ichac97R3StreamGetUsed(pStream);
+            if (cbStreamUsed)
             {
                 /* When running synchronously, do the DMA data transfers here.
                  * Otherwise this will be done in the stream's async I/O thread. */
-                rc2 = ichac97R3StreamTransfer(pThis, pStream, cbToTransfer);
+                rc2 = ichac97R3StreamTransfer(pThis, pStream, cbStreamUsed);
                 AssertRC(rc2);
             }
-        }
+# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
+        }
+# endif
     }
 }
@@ -1699 +1709 @@
                     PDMAUDIOBACKENDCFG Cfg;
                     rc = pDrv->pConnector->pfnGetConfig(pDrv->pConnector, &Cfg);
-                    if (   RT_SUCCESS(rc)
-                        && Cfg.cMaxStreamsIn) /* At least one input source available? */
+                    if (RT_SUCCESS(rc))
                     {
-                        rc = AudioMixerSinkSetRecordingSource(pMixSink, pMixStrm);
-                        LogFlowFunc(("LUN#%RU8: Recording source is now '%s', rc=%Rrc\n", pDrv->uLUN, pStreamCfg->szName, rc));
-                        LogRel2(("AC97: Set recording source to '%s'\n", pStreamCfg->szName));
+                        if (Cfg.cMaxStreamsIn) /* At least one input source available? */
+                        {
+                            rc = AudioMixerSinkSetRecordingSource(pMixSink, pMixStrm);
+                            LogFlowFunc(("LUN#%RU8: Recording source for '%s' -> '%s', rc=%Rrc\n",
+                                         pDrv->uLUN, pStreamCfg->szName, Cfg.szName, rc));
+
+                            if (RT_SUCCESS(rc))
+                                LogRel2(("AC97: Set recording source for '%s' to '%s'\n", pStreamCfg->szName, Cfg.szName));
+                        }
+                        else
+                            LogRel(("AC97: Backend '%s' currently is not offering any recording source for '%s'\n",
+                                    Cfg.szName, pStreamCfg->szName));
                     }
                     else if (RT_FAILURE(rc))