Changeset 61668 in vbox for trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

Timestamp:

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

Author:

vboxsync

Message:

Audio: Update.

File:

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

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);