Changeset 61668 in vbox

Timestamp:

Jun 13, 2016 7:35:56 AM (9 years ago)

Author:

vboxsync

Message:

Audio: Update.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (7 diffs)
• AudioMixer.h (modified) (2 diffs)
• DevIchAc97.cpp (modified) (21 diffs)
• DevIchHda.cpp (modified) (4 diffs)
• DrvAudio.cpp (modified) (5 diffs)

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

@@ -427 +427 @@
     else if (pMixStream)
     {
-        RTStrFree(pMixStream->pszName);
-        pMixStream->pszName = NULL;
+        if (pMixStream->pszName)
+        {
+            RTStrFree(pMixStream->pszName);
+            pMixStream->pszName = NULL;
+        }
 
         RTMemFree(pMixStream);
@@ -471 +474 @@
     }
 
-    /* Remove dirty bit in any case. */
-    pSink->fStatus &= ~AUDMIXSINK_STS_DIRTY;
-
     if (enmSinkCmd == AUDMIXSINKCMD_ENABLE)
+    {
         pSink->fStatus |= AUDMIXSINK_STS_RUNNING;
+    }
     else if (enmSinkCmd == AUDMIXSINKCMD_DISABLE)
-        pSink->fStatus &= ~AUDMIXSINK_STS_RUNNING;
+    {
+        /* Set the sink in a pending disable state first.
+         * The final status (disabled) will be set in the sink's iteration. */
+        pSink->fStatus |= AUDMIXSINK_STS_PENDING_DISABLE;
+    }
 
     /* Not running anymore? Reset. */
@@ -794 +800 @@
 #endif
     }
+
+    /* Reset status. */
+    pSink->fStatus = AUDMIXSINK_STS_NONE;
 }
 
@@ -874 +883 @@
     int rc = VINF_SUCCESS;
 
-    Log3Func(("[%s]\n", pSink->pszName));
+    Log3Func(("[%s] fStatus=0x%x\n", pSink->pszName, pSink->fStatus));
+
+    /* Sink disabled? Take a shortcut. */
+    if (!(pSink->fStatus & AUDMIXSINK_STS_RUNNING))
+        return rc;
+
+    /* Number of detected disabled streams of this sink. */
+    uint8_t cStreamsDisabled = 0;
 
     /* Update last updated timestamp. */
     pSink->tsLastUpdatedNS = RTTimeNanoTS();
 
-    PAUDMIXSTREAM pMixStream;
-    RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
+    PAUDMIXSTREAM pMixStream, pMixStreamNext;
+    RTListForEachSafe(&pSink->lstStreams, pMixStream, pMixStreamNext, AUDMIXSTREAM, Node)
     {
         PPDMAUDIOSTREAM pStream   = pMixStream->pStream;
@@ -934 +950 @@
             }
 
+            PDMAUDIOSTRMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pMixStream->pStream);
+
+            /* Is the stream not enabled and also is not in a pending disable state anymore? */
+            if (   !(strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
+                && !(strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
+            {
+                cStreamsDisabled++;
+            }
+
             if (pSink->enmDir == AUDMIXSINKDIR_INPUT)
             {
@@ -955 +980 @@
     }
 
+    /* All streams disabled and the sink is in pending disable mode? */
+    if (   cStreamsDisabled == pSink->cStreams
+        && (pSink->fStatus & AUDMIXSINK_STS_PENDING_DISABLE))
+    {
+        audioMixerSinkReset(pSink);
+    }
+
     if (RT_FAILURE(rc))
         LogFlowFunc(("Failed with rc=%Rrc\n", rc));
@@ -1073 +1105 @@
     /** @todo Validate fCtl. */
 
-    int rc = pMixStream->pConn->pfnStreamControl(pMixStream->pConn, pMixStream->pStream, enmCmd);
-
-    return rc;
+    LogFlowFunc(("[%s] enmCmd=%ld\n", pMixStream->pszName, enmCmd));
+
+    return pMixStream->pConn->pfnStreamControl(pMixStream->pConn, pMixStream->pStream, enmCmd);
 }
 

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

@@ -75 +75 @@
 /** The sink is active and running. */
 #define AUDMIXSINK_STS_RUNNING               RT_BIT(0)
+/** The sink is in a pending disable state. */
+#define AUDMIXSINK_STS_PENDING_DISABLE       RT_BIT(1)
 /** Dirty flag.
  *  For output sinks this means that there is data in the
@@ -81 +83 @@
  *  sink which has been recorded but not transferred to the
  *  destination yet. */
-#define AUDMIXSINK_STS_DIRTY                 RT_BIT(1)
+#define AUDMIXSINK_STS_DIRTY                 RT_BIT(2)
 
 /**

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

@@ -60 +60 @@
 #endif /* DEBUG_andy */
 
-#define AC97_SSM_VERSION 1
-
-#define AC97_TIMER_HZ 50
+/** Current saved state version. */
+#define AC97_SSM_VERSION    1
+
+/** Timer frequency (in Hz) */
+#define AC97_TIMER_HZ       200
 
 /** @todo Use AC97_ prefixes! */
@@ -536 +538 @@
     bool fActive = RT_BOOL(AudioMixerSinkGetStatus(pSink) & AUDMIXSINK_STS_RUNNING);
 
-    LogFlowFunc(("SD=%RU8, fActive=%RTbool\n", pStream->u8Strm, fActive));
+    LogFlowFunc(("[SD%RU8] fActive=%RTbool\n", pStream->u8Strm, fActive));
     return fActive;
 }
@@ -565 +567 @@
                                fActive ? AUDMIXSINKCMD_ENABLE : AUDMIXSINKCMD_DISABLE);
 
-    LogFlowFunc(("SD=%RU8, fActive=%RTbool, cStreamsActive=%RU8, rc=%Rrc\n",
+    LogFlowFunc(("[SD%RU8] fActive=%RTbool, cStreamsActive=%RU8, rc=%Rrc\n",
                  pStream->u8Strm, fActive, pThis->cStreamsActive, rc));
 
@@ -576 +578 @@
     AssertPtrReturnVoid(pStream);
 
-    LogFlowFuncEnter();
+    LogFlowFunc(("[SD%RU8]\n", pStream->u8Strm));
 
     PAC97BMREGS pRegs = &pStream->Regs;
@@ -598 +600 @@
 static void ichac97StreamDestroy(PAC97STREAM pStream)
 {
-    LogFlowFunc(("SD=%RU8\n", pStream->u8Strm));
+    LogFlowFunc(("[SD%RU8]\n", pStream->u8Strm));
 
     if (pStream->State.au8FIFOW)
@@ -926 +928 @@
     }
 
-    LogFlowFunc(("SD=%RU8, rc=%Rrc\n", u8Strm, rc));
+    LogFlowFunc(("[SD%RU8] rc=%Rrc\n", u8Strm, rc));
     return rc;
 }
@@ -940 +942 @@
     AssertPtrReturnVoid(pStrm);
 
-    LogFlowFunc(("SD=%RU8\n", pStrm->u8Strm));
+    LogFlowFunc(("[SD%RU8]\n", pStrm->u8Strm));
 
     if (pStrm->State.au8FIFOW)
@@ -1153 +1155 @@
     PAC97BMREGS pRegs   = &pStream->Regs;
 
-    uint32_t    addr           = pRegs->bd.addr;
+    uint32_t    uAddr   = pRegs->bd.addr;
+
     uint32_t    cbWrittenTotal = 0;
 
-    Log3Func(("PICB=%RU16, cbMax=%RU32\n", pRegs->picb, cbToWrite));
-
-    cbToWrite = RT_MIN((uint32_t)(pRegs->picb << 1), cbToWrite); /** @todo r=andy Assumes 16bit sample size. */
-    if (!cbToWrite)
+    Log3Func(("PICB=%RU16, cbToWrite=%RU32\n", pRegs->picb, cbToWrite));
+
+    uint32_t cbLeft = RT_MIN((uint32_t)(pRegs->picb << 1), cbToWrite); /** @todo r=andy Assumes 16bit sample size. */
+    if (!cbLeft)
     {
         if (pcbWritten)
@@ -1168 +1171 @@
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("pRegs=%p, cbMax=%RU32, cbToWrite=%RU32\n", pRegs, cbToWrite, cbToWrite));
-
     Assert(pStream->State.offFIFOW <= pStream->State.cbFIFOW);
     uint32_t  cbFIFOW  = pStream->State.cbFIFOW - pStream->State.offFIFOW;
     uint8_t  *pu8FIFOW = &pStream->State.au8FIFOW[pStream->State.offFIFOW];
 
-    uint32_t cbToRead;
-    while (cbToWrite)
-    {
-        cbToRead = RT_MIN(cbToWrite, cbFIFOW);
-        PDMDevHlpPhysRead(pDevIns, addr, pu8FIFOW, cbToRead); /** @todo r=andy Check rc? */
+    uint32_t cbWritten = 0;
+
+    while (cbLeft)
+    {
+        uint32_t cbToRead = RT_MIN(cbLeft, cbFIFOW);
+
+        PDMDevHlpPhysRead(pDevIns, uAddr, pu8FIFOW, cbToRead); /** @todo r=andy Check rc? */
 
 #ifdef AC97_DEBUG_DUMP_PCM_DATA
@@ -1190 +1193 @@
          * Write data to the mixer sink.
          */
-        uint32_t cbWritten;
         rc = AudioMixerSinkWrite(pThis->pSinkOutput, AUDMIXOP_COPY, pu8FIFOW, cbToRead, &cbWritten);
-
-        LogFlowFunc(("\tcbToRead=%RU32, cbToWrite=%RU32, cbWritten=%RU32, cbLeft=%RU32, rc=%Rrc\n",
-                     cbToRead, cbToWrite, cbWritten, cbToWrite - cbWrittenTotal, rc));
-
         if (RT_FAILURE(rc))
             break;
 
         /* Advance. */
-        Assert(cbToWrite >= cbToRead);
-        cbToWrite      -= cbToRead;
-        addr           += cbToRead;
-        cbWrittenTotal += cbToRead;
+        Assert(cbLeft >= cbWritten);
+        cbLeft         -= cbWritten;
+        cbWrittenTotal += cbWritten;
+        uAddr          += cbWritten;
+        Assert(cbWrittenTotal <= cbToWrite);
+
+        LogFlowFunc(("%RU32 / %RU32\n", cbWrittenTotal, cbToWrite));
     }
 
     /* Set new buffer descriptor address. */
-    pRegs->bd.addr = addr;
+    pRegs->bd.addr = uAddr;
 
     if (RT_SUCCESS(rc))
     {
-        if (!cbToWrite) /* All data written? */
-        {
-            if (cbToRead < 4)
+        if (!cbLeft) /* All data written? */
+        {
+            if (cbWritten < 4)
             {
-                AssertMsgFailed(("Unable to save last written sample, cbToRead < 4 (is %RU32)\n", cbToRead));
+                AssertMsgFailed(("Unable to save last written sample, cbWritten < 4 (is %RU32)\n", cbWritten));
                 pThis->last_samp = 0;
             }
             else
-                pThis->last_samp = *(uint32_t *)&pStream->State.au8FIFOW[pStream->State.offFIFOW + cbToRead - 4];
+                pThis->last_samp = *(uint32_t *)&pStream->State.au8FIFOW[pStream->State.offFIFOW + cbWritten - 4];
         }
 
@@ -1226 +1227 @@
     }
 
-    LogFlowFunc(("cbWrittenTotal=%RU32, rc=%Rrc\n", cbWrittenTotal, rc));
+    if (RT_FAILURE(rc))
+        LogFlowFunc(("Failed with %Rrc\n", rc));
+
     return rc;
 }
@@ -1328 +1331 @@
         return;
 
+    if (ASMAtomicReadBool(&pThis->fTimerActive) == true) /* Alredy started? */
+        return;
+
     LogFlowFunc(("Starting timer\n"));
 
@@ -1346 +1352 @@
 
     if (!pThis->pTimer)
+        return;
+
+    if (ASMAtomicReadBool(&pThis->fTimerActive) == false) /* Already stopped? */
         return;
 
@@ -1382 +1391 @@
         cbToProcess = AudioMixerSinkGetReadable(pThis->pSinkLineIn);
         if (cbToProcess)
-        {
             rc = ichac97TransferAudio(pThis, &pThis->StreamLineIn, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer |= RT_SUCCESS(rc);
-        }
+
+        fKickTimer |= AudioMixerSinkGetStatus(pThis->pSinkLineIn) & AUDMIXSINK_STS_DIRTY;
     }
 
@@ -1393 +1401 @@
         cbToProcess = AudioMixerSinkGetReadable(pThis->pSinkMicIn);
         if (cbToProcess)
-        {
             rc = ichac97TransferAudio(pThis, &pThis->StreamMicIn, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer |= RT_SUCCESS(rc);
-        }
+
+        fKickTimer |= AudioMixerSinkGetStatus(pThis->pSinkMicIn) & AUDMIXSINK_STS_DIRTY;
     }
 
@@ -1404 +1411 @@
         cbToProcess = AudioMixerSinkGetWritable(pThis->pSinkOutput);
         if (cbToProcess)
-        {
             rc = ichac97TransferAudio(pThis, &pThis->StreamOut, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer |= RT_SUCCESS(rc);
-        }
+
+        fKickTimer |= AudioMixerSinkGetStatus(pThis->pSinkOutput) & AUDMIXSINK_STS_DIRTY;
     }
 
@@ -1430 +1436 @@
     /* pcbProcessed is optional. */
 
-    Log3Func(("SD=%RU8\n", pStream->u8Strm));
+    Log3Func(("[SD%RU8] cbToProcess=%RU32\n", pStream->u8Strm, cbToProcess));
 
     PAC97BMREGS pRegs = &pStream->Regs;
@@ -1457 +1463 @@
     if (pRegs->sr & SR_BCIS)
     {
+        Log3Func(("[SD%RU8] BCIS set\n", pStream->u8Strm));
         if (pcbProcessed)
             *pcbProcessed = 0;
@@ -1464 +1471 @@
     int rc = VINF_SUCCESS;
 
-    uint32_t cbLeft  = cbToProcess;
+    uint32_t cbLeft  = RT_MIN((uint32_t)(pRegs->picb << 1), cbToProcess);
     uint32_t cbTotal = 0;
+
+    Log3Func(("[SD%RU8] cbLeft=%RU32\n", pStream->u8Strm, cbLeft));
 
     while (cbLeft)
@@ -1501 +1510 @@
             case PO_INDEX:
             {
-                cbToTransfer = (uint32_t)(pRegs->picb << 1);
+                cbToTransfer = RT_MIN((uint32_t)(pRegs->picb << 1), cbLeft); /** @todo r=andy Assumes 16bit samples. */
 
                 rc = ichac97WriteAudio(pThis, pStream, cbToTransfer, &cbTransferred);
@@ -1519 +1528 @@
             case MC_INDEX:
             {
-                cbToTransfer = (uint32_t)(pRegs->picb << 1);
+                cbToTransfer = RT_MIN((uint32_t)(pRegs->picb << 1), cbLeft); /** @todo r=andy Assumes 16bit samples. */
 
                 rc = ichac97ReadAudio(pThis, pStream, cbToTransfer, &cbTransferred);

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

@@ -4132 +4132 @@
         {
             rc = hdaTransfer(pThis, pStreamLineIn, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer = RT_SUCCESS(rc);
+            fKickTimer |= RT_SUCCESS(rc);
         }
     }
@@ -4144 +4144 @@
         {
             rc = hdaTransfer(pThis, pStreamMicIn, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer = RT_SUCCESS(rc);
+            fKickTimer |= RT_SUCCESS(rc);
         }
     }
@@ -4176 +4176 @@
         {
             rc = hdaTransfer(pThis, pStreamFront, cbToProcess, NULL /* pcbProcessed */);
-            fKickTimer = RT_SUCCESS(rc);
+            fKickTimer |= RT_SUCCESS(rc);
         }
     }
@@ -4264 +4264 @@
         return rc;
 
-    Log3Func(("[SD%RU8] fActive=%RTbool\n", pStream->u8SD, pStream->State.fActive));
+    Log3Func(("[SD%RU8] fActive=%RTbool, cbToProcess=%RU32\n", pStream->u8SD, pStream->State.fActive, cbToProcess));
 
     /* Stop request received? */

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

@@ -583 +583 @@
     int rc;
 
+    /* Whether to try closing a pending to close stream. */
+    bool fTryClosePending = false;
+
     do
     {
@@ -609 +612 @@
                 }
             }
+            else
+            {
+                fTryClosePending = true;
+            }
         }
         else if (pHstStream->enmDir == PDMAUDIODIR_OUT)
@@ -630 +637 @@
             LogFlowFunc(("[%s] %RU32 live samples\n", pHstStream->szName, cSamplesLive));
 
-            if (!cSamplesLive) /* No live samples at the moment? */
-            {
-                /* Has the host stream marked as disabled but there still were guest streams relying
-                 * on it? Check if the stream now can be closed and do so, if possible. */
-                if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
-                {
-                    LogFunc(("[%s] Closing pending stream\n", pHstStream->szName));
-                    rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
-                    if (RT_SUCCESS(rc))
-                    {
-                        pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
-                    }
-                    else
-                        LogFunc(("%s: Backend vetoed against closing output stream, rc=%Rrc\n", pHstStream->szName, rc));
-                }
-
-                break;
+            if (!cSamplesLive) /* No live samples (anymore)? */
+            {
+                fTryClosePending = true;
             }
         }
         else
             AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
+
+        if (fTryClosePending)
+        {
+            /* Has the host stream marked as disabled but there still were guest streams relying
+             * on it? Check if the stream now can be closed and do so, if possible. */
+            if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
+            {
+                LogFunc(("[%s] Closing pending stream\n", pHstStream->szName));
+                rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
+                if (RT_SUCCESS(rc))
+                {
+                    pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
+                }
+                else
+                    LogFunc(("%s: Backend vetoed against closing output stream, rc=%Rrc\n", pHstStream->szName, rc));
+            }
+        }
 
     } while (0);
@@ -1385 +1395 @@
     }
 
-    uint32_t cbReadable = 0;
+    uint32_t cReadable = 0;
 
     PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
     if (pGstStream)
-        cbReadable = AudioMixBufLive(&pGstStream->MixBuf);
-
-    LogFlowFunc(("[%s] cbReadable=%RU32\n", pHstStream->szName, cbReadable));
+        cReadable = AudioMixBufLive(&pGstStream->MixBuf);
+
+    LogFlowFunc(("[%s] cbReadable=%RU32\n", pHstStream->szName, cReadable));
 
     rc2 = RTCritSectLeave(&pThis->CritSect);
     AssertRC(rc2);
 
-    return cbReadable;
+    /* Return bytes instead of audio samples. */
+    return AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cReadable);
 }
 
@@ -1422 +1433 @@
     PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
 
-    uint32_t cbWritable = 0;
+    uint32_t cWritable = 0;
 
     if (AudioMixBufLive(&pHstStream->MixBuf) == 0)
-        cbWritable = AudioMixBufFreeBytes(&pGstStream->MixBuf);
-
-    LogFlowFunc(("[%s] cWritable=%RU32\n", pHstStream->szName, cbWritable));
+        cWritable = AudioMixBufFreeBytes(&pGstStream->MixBuf);
+
+    LogFlowFunc(("[%s] cWritable=%RU32\n", pHstStream->szName, cWritable));
 
     rc2 = RTCritSectLeave(&pThis->CritSect);
     AssertRC(rc2);
 
-    return cbWritable;
+    /* Return bytes instead of audio samples. */
+    return AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cWritable);
 }