Changeset 64565 in vbox for trunk

Timestamp:

Nov 4, 2016 12:26:57 PM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixBuffer.cpp: Also take the used samples count into account in AudioMixBufFinish(). Converted some VINF_ return codes to VERR_ ones for easier error handling. Documentation, logging tweaks.

File:

• trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (modified) (15 diffs)

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

@@ -226 +226 @@
 
         pIter->cMixed -= RT_MIN(pIter->cMixed, cSamplesToClear);
+        pIter->cUsed  -= RT_MIN(pIter->cUsed,  AUDIOMIXBUF_S2S_RATIO(pMixBuf, cSamplesToClear));
     }
 
@@ -974 +975 @@
  *
  * @return  IPRT status code.
+ *          VERR_NO_DATA if the source does not have any audio data.
+ *          VERR_BUFFER_UNDERFLOW if the source did not have enough audio data.
+ *          VERR_BUFFER_OVERFLOW if the destination did not have enough space to store the converted source audio data.
+ *
  * @param   pDst                    Destination mixing buffer.
  * @param   pSrc                    Source mixing buffer.
@@ -996 +1001 @@
         if (pcProcessed)
             *pcProcessed = 0;
-        return VINF_SUCCESS;
+        return VERR_BUFFER_OVERFLOW;
     }
 
@@ -1009 +1014 @@
     uint32_t offDstWrite  = pDst->offWrite;
 
-    if (   !cSrcAvail
-        || !cDstAvail)
-    {
-        if (pcProcessed)
-            *pcProcessed = 0;
-        return VINF_SUCCESS;
-    }
+    if (!cSrcAvail)
+        return VERR_NO_DATA;
 
     AUDMIXBUF_LOG(("cSrcSamples=%RU32, cSrcAvail=%RU32 -> cDstAvail=%RU32\n", cSrcSamples,  cSrcAvail, cDstAvail));
@@ -1091 +1091 @@
     if (pDst->cUsed > pDst->cSamples)
     {
-        LogFlowFunc(("Warning: Destination buffer used %RU32 / %RU32 samples\n", pDst->cUsed, pDst->cSamples));
+        LogFunc(("Warning: Destination buffer used %RU32 / %RU32 samples\n", pDst->cUsed, pDst->cSamples));
         pDst->offWrite     = 0;
         pDst->cUsed        = pDst->cSamples;
@@ -1099 +1099 @@
     else if (!cSrcToRead && cDstAvail)
     {
-        AUDMIXBUF_LOG(("Warning: Source buffer '%s' ran out of data\n", pSrc->pszName));
+        LogFunc(("Warning: Source buffer '%s' ran out of data\n", pSrc->pszName));
         rc = VERR_BUFFER_UNDERFLOW;
     }
     else if (cSrcAvail && !cDstAvail)
     {
-        AUDMIXBUF_LOG(("Warning: Destination buffer '%s' full (%RU32 source samples left)\n", pDst->pszName, cSrcAvail));
+        LogFunc(("Warning: Destination buffer '%s' full (%RU32 source samples left)\n", pDst->pszName, cSrcAvail));
         rc = VERR_BUFFER_OVERFLOW;
     }
@@ -1124 +1124 @@
  * Mixes audio samples down to the parent mixing buffer.
  *
- * @return  IPRT status code.
+ * @return  IPRT status code. See audioMixBufMixTo() for a more detailed explanation.
  * @param   pMixBuf                 Mixing buffer to mix samples down to parent.
  * @param   cSamples                Number of audio samples of specified mixing buffer to to mix
@@ -1153 +1153 @@
 DECL_FORCE_INLINE(void) audioMixBufDbgPrintSingle(PPDMAUDIOMIXBUF pMixBuf, bool fIsParent, uint16_t uIdtLvl)
 {
-    AUDMIXBUF_LOG(("%*s[%s] %s: offRead=%RU32, offWrite=%RU32, cMixed=%RU32 -> %RU32/%RU32\n",
-                   uIdtLvl * 4, "", fIsParent ? "PARENT" : "CHILD",
-                   pMixBuf->pszName, pMixBuf->offRead, pMixBuf->offWrite, pMixBuf->cMixed, pMixBuf->cUsed, pMixBuf->cSamples));
+    LogFunc(("%*s[%s] %s: offRead=%RU32, offWrite=%RU32, cMixed=%RU32 -> %RU32/%RU32\n",
+             uIdtLvl * 4, "", fIsParent ? "PARENT" : "CHILD",
+             pMixBuf->pszName, pMixBuf->offRead, pMixBuf->offWrite, pMixBuf->cMixed, pMixBuf->cUsed, pMixBuf->cSamples));
 }
 
@@ -1222 +1222 @@
         pParent = pMixBuf->pParent;
 
-    AUDMIXBUF_LOG(("***************************************************************************************\n"));
+    LogFunc(("***************************************************************************************\n"));
 
     audioMixBufDbgPrintSingle(pMixBuf, pParent == pMixBuf /* fIsParent */, 0 /* iIdtLevel */);
@@ -1234 +1234 @@
     }
 
-    AUDMIXBUF_LOG(("***************************************************************************************\n"));
+    LogFunc(("***************************************************************************************\n"));
 }
 
@@ -1260 +1260 @@
 {
     AssertPtrReturn(pMixBuf, 0);
-
-    AUDMIXBUF_LOG(("%s: cUsed=%RU32\n", pMixBuf->pszName, pMixBuf->cUsed));
     return pMixBuf->cUsed;
 }
@@ -1746 +1744 @@
  * The sample format being written must match the format of the mixing buffer.
  *
- * @return  IPRT status code, or VINF_BUFFER_OVERFLOW if samples which not have
+ * @return  IPRT status code, or VERR_BUFFER_OVERFLOW if samples which not have
  *          been processed yet have been overwritten (due to cyclic buffer).
  * @param   pMixBuf                 Pointer to mixing buffer to write to.
@@ -1763 +1761 @@
  * Writes audio samples of a specific format.
  *
- * @return  IPRT status code, or VINF_BUFFER_OVERFLOW if samples which not have
+ * @return  IPRT status code, or VERR_BUFFER_OVERFLOW if samples which not have
  *          been processed yet have been overwritten (due to cyclic buffer).
  * @param   pMixBuf                 Pointer to mixing buffer to write to.
@@ -1799 +1797 @@
                        pMixBuf->pszName, pMixBuf->pParent->pszName));
 
-        return VINF_BUFFER_OVERFLOW;
+        return VERR_BUFFER_OVERFLOW;
     }
 
@@ -1905 +1903 @@
         pMixBuf->cUsed = pMixBuf->cSamples;
 
-        rc = VINF_BUFFER_OVERFLOW;
+        rc = VERR_BUFFER_OVERFLOW;
     }