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

Timestamp:

May 11, 2016 9:13:40 AM (9 years ago)

Author:

vboxsync

Message:

Audio/AC97: Lowered timer to 100Hz and start/stop it only if needed. Should improve overall performance.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (4 diffs)
• AudioMixer.h (modified) (1 diff)
• DevIchAc97.cpp (modified) (15 diffs)

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

@@ -51 +51 @@
 static int audioMixerSinkUpdateVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster);
 static void audioMixerSinkRemoveStreamInternal(PAUDMIXSINK pSink, PAUDMIXSTREAM pStream);
+static int audioMixerSinkUpdateInternal(PAUDMIXSINK pSink);
 
 static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pStream);
@@ -516 +517 @@
 }
 
-int AudioMixerSinkUpdate(PAUDMIXSINK pSink)
+void AudioMixerSinkTimerUpdate(PAUDMIXSINK pSink, uint64_t cTicksPerSec, uint64_t cTicksElapsed, uint32_t *pcbData)
+{
+    uint32_t cSamplesMin  = (uint32_t)((2 * cTicksElapsed * pSink->PCMProps.uHz + cTicksPerSec) / cTicksPerSec / 2);
+    uint32_t cbSamplesMin = cSamplesMin << pSink->PCMProps.cShift;
+
+    LogFlowFunc(("%s: cbSamplesMin=%RU32\n", pSink->pszName, cbSamplesMin));
+
+    audioMixerSinkUpdateInternal(pSink);
+
+    if (pcbData)
+        *pcbData = cbSamplesMin;
+}
+
+static int audioMixerSinkUpdateInternal(PAUDMIXSINK pSink)
 {
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
@@ -532 +546 @@
             || cSamplesLive)
         {
-            Log3Func(("cbIn=%RU32, cbOut=%RU32, cSamplesLive=%RU32, rc2=%Rrc\n", cbIn, cbOut, cSamplesLive, rc2));
+            Log3Func(("%s: cbIn=%RU32, cbOut=%RU32, cSamplesLive=%RU32, rc2=%Rrc\n",
+                      pSink->pszName, cbIn, cbOut, cSamplesLive, rc2));
         }
 #endif
@@ -551 +566 @@
 
     return VINF_SUCCESS;
+}
+
+int AudioMixerSinkUpdate(PAUDMIXSINK pSink)
+{
+    return audioMixerSinkUpdateInternal(pSink);
 }
 

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

@@ -163 +163 @@
 int AudioMixerSinkSetFormat(PAUDMIXSINK pSink, PPDMPCMPROPS pPCMProps);
 int AudioMixerSinkSetVolume(PAUDMIXSINK pSink, PPDMAUDIOVOLUME pVol);
+void AudioMixerSinkTimerUpdate(PAUDMIXSINK pSink, uint64_t cTicksPerSec, uint64_t cTicksElapsed, uint32_t *pcbData);
 int AudioMixerSinkWrite(PAUDMIXSINK pSink, AUDMIXOP enmOp, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten);
 int AudioMixerSinkUpdate(PAUDMIXSINK pSink);

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

@@ -52 +52 @@
 #define AC97_SSM_VERSION 1
 
-#define AC97_TIMER_HZ 200
+#define AC97_TIMER_HZ 100
 
 #ifdef VBOX
@@ -363 +363 @@
     /** Stream state for output. */
     AC97STREAM              StrmStOut;
+    /** Number of active (running) SDn streams. */
+    uint8_t                 cStreamsActive;
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
     /** The timer for pumping data thru the attached LUN drivers. */
     PTMTIMERR3              pTimer;
 # if HC_ARCH_BITS == 32
-    uint32_t                Alignment1;
+    uint32_t                Padding0;
 # endif
     /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
@@ -376 +378 @@
 #endif
 #ifdef VBOX_WITH_STATISTICS
+    uint8_t                 Padding1;
     STAMPROFILE             StatTimer;
     STAMCOUNTER             StatBytesRead;
@@ -382 +385 @@
     /** List of associated LUN drivers (AC97DRIVER). */
     RTLISTANCHOR            lstDrv;
-    /** The device' software mixer. */
+    /** The device's software mixer. */
     R3PTRTYPE(PAUDIOMIXER)  pMixer;
     /** Audio sink for PCM output. */
@@ -401 +404 @@
 
 #ifdef VBOX_WITH_STATISTICS
-AssertCompileMemberAlignment(AC97STATE, StatTimer, 8);
+AssertCompileMemberAlignment(AC97STATE, StatTimer,        8);
+AssertCompileMemberAlignment(AC97STATE, StatBytesRead,    8);
+AssertCompileMemberAlignment(AC97STATE, StatBytesWritten, 8);
 #endif
 
@@ -412 +417 @@
 static DECLCALLBACK(void) ichac97Reset(PPDMDEVINS pDevIns);
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
+static void ichac97TimerMaybeStart(PAC97STATE pThis);
+static void ichac97TimerMaybeStop(PAC97STATE pThis);
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
 #endif
@@ -523 +530 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("u8Strm=%RU8, fActive=%RTbool\n", pStream->u8Strm, fActive));
+    if (!fActive)
+    {
+        if (pThis->cStreamsActive) /* Disable can be called mupltiple times. */
+            pThis->cStreamsActive--;
+
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
+        ichac97TimerMaybeStop(pThis);
+#endif
+    }
+    else
+    {
+        pThis->cStreamsActive++;
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
+        ichac97TimerMaybeStart(pThis);
+#endif
+    }
+
+    LogFlowFunc(("u8Strm=%RU8, fActive=%RTbool, cStreamsActive=%RU8\n", pStream->u8Strm, fActive, pThis->cStreamsActive));
 
     return AudioMixerSinkCtl(ichac97IndexToSink(pThis, pStream->u8Strm),
@@ -1023 +1047 @@
     PDMAUDIORECSOURCE ars = ichac97IndextoRecSource(rs);
     PDMAUDIORECSOURCE als = ichac97IndextoRecSource(ls);
-    //AUD_set_record_source(&als, &ars);
     rs = ichac97RecSourceToIndex(ars);
     ls = ichac97RecSourceToIndex(als);
@@ -1280 +1303 @@
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
 
+static void ichac97TimerMaybeStart(PAC97STATE pThis)
+{
+    LogFlowFunc(("cStreamsActive=%RU8\n", pThis->cStreamsActive));
+
+    if (pThis->cStreamsActive == 0) /* Only start the timer if there are no active streams. */
+        return;
+
+    if (!pThis->pTimer)
+        return;
+
+    /* Fire off timer. */
+    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->cTimerTicks);
+}
+
+static void ichac97TimerMaybeStop(PAC97STATE pThis)
+{
+    LogFlowFunc(("cStreamsActive=%RU8\n", pThis->cStreamsActive));
+
+    if (pThis->cStreamsActive) /* Some streams still active? Bail out. */
+        return;
+
+    if (!pThis->pTimer)
+        return;
+
+    int rc2 = TMTimerStop(pThis->pTimer);
+    AssertRC(rc2);
+}
+
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -1288 +1339 @@
     STAM_PROFILE_START(&pThis->StatTimer, a);
 
-    uint32_t cbInMax  = 0;
-    uint32_t cbOutMin = UINT32_MAX;
-
-//    PAC97DRIVER pDrv;
-
     uint64_t cTicksNow     = TMTimerGet(pTimer);
     uint64_t cTicksElapsed = cTicksNow  - pThis->uTimerTS;
@@ -1299 +1345 @@
     pThis->uTimerTS = cTicksNow;
 
-#if 0
-    /*
-     * Calculate the mixer's (fixed) sampling rate.
-     */
-    AssertPtr(pThis->pMixer);
-
-    PDMAUDIOSTREAMCFG mixerStrmCfg;
-    int rc = AudioMixerGetDeviceFormat(pThis->pMixer, &mixerStrmCfg);
-    AssertRC(rc);
-
-    PDMPCMPROPS mixerStrmProps;
-    rc = DrvAudioStreamCfgToProps(&mixerStrmCfg, &mixerStrmProps);
-    AssertRC(rc);
-
-    uint32_t cMixerSamplesMin  = (int)((2 * cTicksElapsed * mixerStrmCfg.uHz + cTicksPerSec) / cTicksPerSec / 2);
-    uint32_t cbMixerSamplesMin = cMixerSamplesMin << mixerStrmProps.cShift;
-
-    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
-    {
-        uint32_t cbIn = 0;
-        uint32_t cbOut = 0;
-
-        rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, NULL /* cSamplesLive */);
-        if (RT_SUCCESS(rc))
-            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* cSamplesPlayed */);
-
-#ifdef DEBUG_TIMER
-        LogFlowFunc(("LUN#%RU8: rc=%Rrc, cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, rc, cbIn, cbOut));
-#endif
-        /* If we there was an error handling (available) output or there simply is no output available,
-         * then calculate the minimum data rate which must be processed by the device emulation in order
-         * to function correctly.
-         *
-         * This is not the optimal solution, but as we have to deal with this on a timer-based approach
-         * (until we have the audio callbacks) we need to have device' DMA engines running. */
-        if (!pDrv->pConnector->pfnIsValidOut(pDrv->pConnector, pDrv->Out.pStrmOut))
-        {
-            /* Use the mixer's (fixed) sampling rate. */
-            cbOut = RT_MAX(cbOut, cbMixerSamplesMin);
-            continue;
-        }
-
-        const bool fIsActiveOut = pDrv->pConnector->pfnIsActiveOut(pDrv->pConnector, pDrv->Out.pStrmOut);
-        if (   RT_FAILURE(rc)
-            || !fIsActiveOut)
-        {
-            uint32_t cSamplesMin  = (int)((2 * cTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + cTicksPerSec) / cTicksPerSec / 2);
-            uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
-
-#ifdef DEBUG_TIMER
-            LogFlowFunc(("\trc=%Rrc, cSamplesMin=%RU32, cbSamplesMin=%RU32\n", rc, cSamplesMin, cbSamplesMin));
-#endif
-            cbOut = RT_MAX(cbOut, cbSamplesMin);
-        }
-
-        cbOutMin = RT_MIN(cbOutMin, cbOut);
-        cbInMax  = RT_MAX(cbInMax, cbIn);
-    }
-
-#ifdef DEBUG_TIMER
-    LogFlowFunc(("cbInMax=%RU32, cbOutMin=%RU32\n", cbInMax, cbOutMin));
-#endif
-
-    if (cbOutMin == UINT32_MAX)
-        cbOutMin = 0;
-
-    /*
-     * Playback.
-     */
-    if (cbOutMin)
-    {
-        Assert(cbOutMin != UINT32_MAX);
-        ichac97TransferAudio(pThis, PO_INDEX, cbOutMin); /** @todo Add rc! */
-    }
-
-    /*
-     * Recording.
-     */
-    if (cbInMax)
-        ichac97TransferAudio(pThis, PI_INDEX, cbInMax); /** @todo Add rc! */
-#else
-    AudioMixerSinkUpdate(pThis->pSinkLineIn);
-    AudioMixerSinkUpdate(pThis->pSinkMicIn);
-    AudioMixerSinkUpdate(pThis->pSinkOutput);
-
-    uint32_t cMixerSamplesMin  = (int)((2 * cTicksElapsed *   pThis->pSinkOutput->PCMProps.uHz + cTicksPerSec) / cTicksPerSec / 2);
-    uint32_t cbMixerSamplesMin = cMixerSamplesMin <<  pThis->pSinkOutput->PCMProps.cShift;
-
-    Log3Func(("cMixerSamplesMin=%RU32, cbMixerSamplesMin=%RU32, mixerHz=%RU32\n",
-              cMixerSamplesMin, cbMixerSamplesMin,  pThis->pSinkOutput->PCMProps.uHz));
-
-    //uint32_t cbSamplesElapsed = 5120; //((48000 / AC97_TIMER_HZ) * 20) / 8;
-
-    uint32_t cMixerSamplesMinIn  = (int)((2 * cTicksElapsed *   pThis->pSinkLineIn->PCMProps.uHz + cTicksPerSec) / cTicksPerSec / 2);
-    uint32_t cbMixerSamplesMinIn = cMixerSamplesMinIn <<  pThis->pSinkLineIn->PCMProps.cShift;
-
-    ichac97TransferAudio(pThis, &pThis->StrmStLineIn, cMixerSamplesMinIn); /** @todo Add rc! */
-    ichac97TransferAudio(pThis, &pThis->StrmStOut,    cbMixerSamplesMin);  /** @todo Add rc! */
-#endif
+    uint32_t cbLineIn;
+    AudioMixerSinkTimerUpdate(pThis->pSinkLineIn, cTicksPerSec, cTicksElapsed, &cbLineIn);
+    if (cbLineIn)
+        ichac97TransferAudio(pThis, &pThis->StrmStLineIn, cbLineIn); /** @todo Add rc! */
+
+    uint32_t cbMicIn;
+    AudioMixerSinkTimerUpdate(pThis->pSinkMicIn , cTicksPerSec, cTicksElapsed, &cbMicIn);
+
+    uint32_t cbOut;
+    AudioMixerSinkTimerUpdate(pThis->pSinkOutput, cTicksPerSec, cTicksElapsed, &cbOut);
+    if (cbOut)
+        ichac97TransferAudio(pThis, &pThis->StrmStOut, cbOut);  /** @todo Add rc! */
 
     /* Kick the timer again. */
@@ -1408 +1366 @@
 }
 
-#endif
+#endif /* !VBOX_WITH_AUDIO_CALLBACKS */
 
 static int ichac97TransferAudio(PAC97STATE pThis, PAC97STREAM pStream, uint32_t cbElapsed)
@@ -1523 +1481 @@
             if (pRegs->civ == pRegs->lvi)
             {
-                Log3Func(("Underrun civ (%RU8) == lvi (%RU8)\n", pRegs->civ, pRegs->lvi));
+                /* Did we run out of data? */
+                LogFunc(("Underrun CIV (%RU8) == LVI (%RU8)\n", pRegs->civ, pRegs->lvi));
+
                 new_sr |= SR_LVBCI | SR_DCH | SR_CELV;
                 pThis->bup_flag = (pRegs->bd.ctl_len & BD_BUP) ? BUP_LAST : 0;
@@ -2260 +2220 @@
 
     /*
-     * Stop any audio currently playing.
-     */
-    /*
      * Stop any audio currently playing and/or recording.
      */
@@ -2755 +2712 @@
             LogFunc(("Timer ticks=%RU64 (%RU16 Hz)\n", pThis->cTimerTicks, uTimerHz));
 
-            /* Fire off timer. */
-            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->cTimerTicks);
+            ichac97TimerMaybeStart(pThis);
         }
     }