Index: /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (revision 54139) +++ /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (revision 54140) @@ -17,6 +17,11 @@ # undef LOG_GROUP #endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include +#if 0 +# define AUDMIXBUF_LOG(x) LogFlowFunc(x) +# define LOG_GROUP LOG_GROUP_DEV_AUDIO +# include +#else + #define AUDMIXBUF_LOG(x) +#endif /* @@ -94,13 +99,13 @@ void audioMixBufFinish(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToClear) { - LogFlowFunc(("cSamples=%RU32\n", cSamplesToClear)); - LogFlowFunc(("%s: offReadWrite=%RU32, cProcessed=%RU32\n", - pMixBuf->pszName, pMixBuf->offReadWrite, pMixBuf->cProcessed)); + AUDMIXBUF_LOG(("cSamples=%RU32\n", cSamplesToClear)); + AUDMIXBUF_LOG(("%s: offReadWrite=%RU32, cProcessed=%RU32\n", + pMixBuf->pszName, pMixBuf->offReadWrite, pMixBuf->cProcessed)); PPDMAUDIOMIXBUF pIter; RTListForEach(&pMixBuf->lstBuffers, pIter, PDMAUDIOMIXBUF, Node) { - LogFlowFunc(("\t%s: cMixed=%RU32 -> %RU32\n", - pIter->pszName, pIter->cMixed, pIter->cMixed - cSamplesToClear)); + AUDMIXBUF_LOG(("\t%s: cMixed=%RU32 -> %RU32\n", + pIter->pszName, pIter->cMixed, pIter->cMixed - cSamplesToClear)); Assert(pIter->cMixed >= cSamplesToClear); @@ -114,7 +119,7 @@ if (cLeft > pMixBuf->offReadWrite) /* Zero end of buffer first (wrap-around). */ { - LogFlowFunc(("Clearing1: %RU32 - %RU32\n", - (pMixBuf->cSamples - (cLeft - pMixBuf->offReadWrite)), - pMixBuf->cSamples)); + AUDMIXBUF_LOG(("Clearing1: %RU32 - %RU32\n", + (pMixBuf->cSamples - (cLeft - pMixBuf->offReadWrite)), + pMixBuf->cSamples)); RT_BZERO(pMixBuf->pSamples + (pMixBuf->cSamples - (cLeft - pMixBuf->offReadWrite)), @@ -129,6 +134,6 @@ if (cLeft) { - LogFlowFunc(("Clearing2: %RU32 - %RU32\n", - offClear, offClear + cLeft)); + AUDMIXBUF_LOG(("Clearing2: %RU32 - %RU32\n", + offClear, offClear + cLeft)); RT_BZERO(pMixBuf->pSamples + offClear, cLeft * sizeof(PDMAUDIOSAMPLE)); } @@ -144,5 +149,5 @@ if (pMixBuf->pszName) { - LogFlowFunc(("%s\n", pMixBuf->pszName)); + AUDMIXBUF_LOG(("%s\n", pMixBuf->pszName)); RTStrFree(pMixBuf->pszName); @@ -171,5 +176,5 @@ cFree = pMixBuf->cSamples - pMixBuf->cProcessed; - LogFlowFunc(("%s: cFree=%RU32\n", pMixBuf->pszName, cFree)); + AUDMIXBUF_LOG(("%s: cFree=%RU32\n", pMixBuf->pszName, cFree)); return cFree; } @@ -185,5 +190,5 @@ AssertReturn(cSamples, VERR_INVALID_PARAMETER); - LogFlowFunc(("%s: cSamples=%RU32\n", pMixBuf->pszName, cSamples)); + AUDMIXBUF_LOG(("%s: cSamples=%RU32\n", pMixBuf->pszName, cSamples)); size_t cbSamples = cSamples * sizeof(PDMAUDIOSAMPLE); @@ -204,5 +209,5 @@ #ifdef DEBUG_MACROS -# define AUDMIXBUF_MACRO_LOG(x) LogFlowFunc((x)) +# define AUDMIXBUF_MACRO_LOG(x) AUDMIXBUF_LOG((x)) #elif defined(TESTCASE) # define AUDMIXBUF_MACRO_LOG(x) RTPrintf x @@ -616,10 +621,10 @@ return VERR_NO_MEMORY; - LogFlowFunc(("%s: uHz=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool\n", - pMixBuf->pszName, - AUDMIXBUF_FMT_SAMPLE_FREQ(pMixBuf->AudioFmt), - AUDMIXBUF_FMT_CHANNELS(pMixBuf->AudioFmt), - AUDMIXBUF_FMT_BITS_PER_SAMPLE(pMixBuf->AudioFmt), - RT_BOOL(AUDMIXBUF_FMT_SIGNED(pMixBuf->AudioFmt)))); + AUDMIXBUF_LOG(("%s: uHz=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool\n", + pMixBuf->pszName, + AUDMIXBUF_FMT_SAMPLE_FREQ(pMixBuf->AudioFmt), + AUDMIXBUF_FMT_CHANNELS(pMixBuf->AudioFmt), + AUDMIXBUF_FMT_BITS_PER_SAMPLE(pMixBuf->AudioFmt), + RT_BOOL(AUDMIXBUF_FMT_SIGNED(pMixBuf->AudioFmt)))); return audioMixBufAllocBuf(pMixBuf, cSamples); @@ -649,6 +654,6 @@ if (pMixBuf->pParent) /* Already linked? */ { - LogFlowFunc(("%s: Already linked to \"%s\"\n", - pMixBuf->pszName, pMixBuf->pParent->pszName)); + AUDMIXBUF_LOG(("%s: Already linked to \"%s\"\n", + pMixBuf->pszName, pMixBuf->pParent->pszName)); return VERR_ACCESS_DENIED; } @@ -677,6 +682,6 @@ if (cSamples != pMixBuf->cSamples) { - LogFlowFunc(("%s: Reallocating samples %RU32 -> %RU32\n", - pMixBuf->pszName, pMixBuf->cSamples, cSamples)); + AUDMIXBUF_LOG(("%s: Reallocating samples %RU32 -> %RU32\n", + pMixBuf->pszName, pMixBuf->cSamples, cSamples)); pMixBuf->pSamples = (PPDMAUDIOSAMPLE)RTMemRealloc(pMixBuf->pSamples, @@ -700,11 +705,11 @@ / AUDMIXBUF_FMT_SAMPLE_FREQ(pParent->AudioFmt); - LogFlowFunc(("uThisHz=%RU32, uParentHz=%RU32, iFreqRatio=%RI64, uRateInc=%RU64, cSamples=%RU32 (%RU32 parent)\n", - AUDMIXBUF_FMT_SAMPLE_FREQ(pMixBuf->AudioFmt), - AUDMIXBUF_FMT_SAMPLE_FREQ(pParent->AudioFmt), - pMixBuf->iFreqRatio, - pMixBuf->pRate->dstInc, - pMixBuf->cSamples, - pParent->cSamples)); + AUDMIXBUF_LOG(("uThisHz=%RU32, uParentHz=%RU32, iFreqRatio=%RI64, uRateInc=%RU64, cSamples=%RU32 (%RU32 parent)\n", + AUDMIXBUF_FMT_SAMPLE_FREQ(pMixBuf->AudioFmt), + AUDMIXBUF_FMT_SAMPLE_FREQ(pParent->AudioFmt), + pMixBuf->iFreqRatio, + pMixBuf->pRate->dstInc, + pMixBuf->cSamples, + pParent->cSamples)); } @@ -733,6 +738,6 @@ uint32_t cLive = pSrc->cMixed; if (cLive >= pDst->cSamples) - LogFlowFunc(("Destination buffer \"%s\" full (%RU32 samples max), live samples = %RU32\n", - pDst->pszName, pDst->cSamples, cLive)); + AUDMIXBUF_LOG(("Destination buffer \"%s\" full (%RU32 samples max), live samples = %RU32\n", + pDst->pszName, pDst->cSamples, cLive)); /* Dead samples are the number of samples in the destination buffer which @@ -748,6 +753,6 @@ uint32_t offWrite = (pDst->offReadWrite + cLive) % pDst->cSamples; - LogFlowFunc(("pSrc=%s (%RU32 samples), pDst=%s (%RU32 samples), cLive=%RU32, cDead=%RU32, cToReadTotal=%RU32, offWrite=%RU32\n", - pSrc->pszName, pSrc->cSamples, pDst->pszName, pDst->cSamples, cLive, cDead, cToReadTotal, offWrite)); + AUDMIXBUF_LOG(("pSrc=%s (%RU32 samples), pDst=%s (%RU32 samples), cLive=%RU32, cDead=%RU32, cToReadTotal=%RU32, offWrite=%RU32\n", + pSrc->pszName, pSrc->cSamples, pDst->pszName, pDst->cSamples, cLive, cDead, cToReadTotal, offWrite)); uint32_t cToRead, cToWrite; @@ -763,5 +768,5 @@ if (!cToWrite) { - LogFlowFunc(("Destination buffer \"%s\" full\n", pDst->pszName)); + AUDMIXBUF_LOG(("Destination buffer \"%s\" full\n", pDst->pszName)); break; } @@ -770,6 +775,6 @@ Assert(offRead + cToRead <= pSrc->cSamples); - LogFlowFunc(("\tcDead=%RU32, offWrite=%RU32, cToWrite=%RU32, offRead=%RU32, cToRead=%RU32\n", - cDead, offWrite, cToWrite, offRead, cToRead)); + AUDMIXBUF_LOG(("\tcDead=%RU32, offWrite=%RU32, cToWrite=%RU32, offRead=%RU32, cToRead=%RU32\n", + cDead, offWrite, cToWrite, offRead, cToRead)); audioMixBufOpBlend(pDst->pSamples + offWrite, cToWrite, @@ -778,5 +783,5 @@ &cWritten, &cRead); - LogFlowFunc(("\t\tcWritten=%RU32, cRead=%RU32\n", cWritten, cRead)); + AUDMIXBUF_LOG(("\t\tcWritten=%RU32, cRead=%RU32\n", cWritten, cRead)); cReadTotal += cRead; @@ -803,6 +808,6 @@ *pcProcessed = cReadTotal; - LogFlowFunc(("cSrcRead=%RU32, cSrcMixed=%RU32, rc=%Rrc\n", - cReadTotal, pSrc->cMixed, VINF_SUCCESS)); + AUDMIXBUF_LOG(("cSrcRead=%RU32, cSrcMixed=%RU32, rc=%Rrc\n", + cReadTotal, pSrc->cMixed, VINF_SUCCESS)); return VINF_SUCCESS; } @@ -851,20 +856,20 @@ pParent = pMixBuf->pParent; - LogFlowFunc(("********************************************\n")); - LogFlowFunc(("%s: offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n", - pParent->pszName, - pParent->offReadWrite, pParent->cProcessed, pParent->cMixed, - AUDIOMIXBUF_S2B(pParent, 1))); + AUDMIXBUF_LOG(("********************************************\n")); + AUDMIXBUF_LOG(("%s: offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n", + pParent->pszName, + pParent->offReadWrite, pParent->cProcessed, pParent->cMixed, + AUDIOMIXBUF_S2B(pParent, 1))); PPDMAUDIOMIXBUF pIter; RTListForEach(&pParent->lstBuffers, pIter, PDMAUDIOMIXBUF, Node) { - LogFlowFunc(("\t%s: offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n", - pIter->pszName, - pIter->offReadWrite, pIter->cProcessed, pIter->cMixed, - AUDIOMIXBUF_S2B(pIter, 1))); - } - LogFlowFunc(("Total samples mixed: %RU64\n", s_cSamplesMixedTotal)); - LogFlowFunc(("********************************************\n")); + AUDMIXBUF_LOG(("\t%s: offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n", + pIter->pszName, + pIter->offReadWrite, pIter->cProcessed, pIter->cMixed, + AUDIOMIXBUF_S2B(pIter, 1))); + } + AUDMIXBUF_LOG(("Total samples mixed: %RU64\n", s_cSamplesMixedTotal)); + AUDMIXBUF_LOG(("********************************************\n")); #endif } @@ -907,6 +912,6 @@ cToProcess = RT_MIN(cToProcess, AUDIOMIXBUF_B2S(pMixBuf, cbBuf)); - LogFlowFunc(("%s: offSamples=%RU32, cLive=%RU32, cDead=%RU32, cToProcess=%RU32\n", - pMixBuf->pszName, offSamples, cLive, cDead, cToProcess)); + AUDMIXBUF_LOG(("%s: offSamples=%RU32, cLive=%RU32, cDead=%RU32, cToProcess=%RU32\n", + pMixBuf->pszName, offSamples, cLive, cDead, cToProcess)); int rc; @@ -924,5 +929,5 @@ *pcbRead = AUDIOMIXBUF_S2B(pMixBuf, cToProcess); - LogFlowFunc(("cbRead=%RU32, rc=%Rrc\n", AUDIOMIXBUF_S2B(pMixBuf, cToProcess), rc)); + AUDMIXBUF_LOG(("cbRead=%RU32, rc=%Rrc\n", AUDIOMIXBUF_S2B(pMixBuf, cToProcess), rc)); return rc; } @@ -949,7 +954,7 @@ pMixBuf->cProcessed); - LogFlowFunc(("%s: pvBuf=%p, cbBuf=%zu (%RU32 samples), cToRead=%RU32\n", - pMixBuf->pszName, pvBuf, - cbBuf, AUDIOMIXBUF_B2S(pMixBuf, cbBuf), cToRead)); + AUDMIXBUF_LOG(("%s: pvBuf=%p, cbBuf=%zu (%RU32 samples), cToRead=%RU32\n", + pMixBuf->pszName, pvBuf, + cbBuf, AUDIOMIXBUF_B2S(pMixBuf, cbBuf), cToRead)); if (!cToRead) @@ -992,5 +997,5 @@ if (cLenSrc1) { - LogFlowFunc(("P1: offRead=%RU32, cToRead=%RU32\n", pMixBuf->offReadWrite, cLenSrc1)); + AUDMIXBUF_LOG(("P1: offRead=%RU32, cToRead=%RU32\n", pMixBuf->offReadWrite, cLenSrc1)); rc = audioMixBufConvTo(pvBuf, pSamplesSrc1, cLenSrc1, enmFmt); } @@ -1002,6 +1007,6 @@ AssertPtr(pSamplesSrc2); - LogFlowFunc(("P2: cToRead=%RU32, offWrite=%RU32 (%zu bytes)\n", cLenSrc2, cLenSrc1, - AUDIOMIXBUF_S2B(pMixBuf, cLenSrc1))); + AUDMIXBUF_LOG(("P2: cToRead=%RU32, offWrite=%RU32 (%zu bytes)\n", cLenSrc2, cLenSrc1, + AUDIOMIXBUF_S2B(pMixBuf, cLenSrc1))); rc = audioMixBufConvTo((uint8_t *)pvBuf + AUDIOMIXBUF_S2B(pMixBuf, cLenSrc1), pSamplesSrc2, cLenSrc2, enmFmt); @@ -1019,7 +1024,7 @@ audioMixBufPrint(pMixBuf); - LogFlowFunc(("cRead=%RU32 (%zu bytes), rc=%Rrc\n", - cLenSrc1 + cLenSrc2, - AUDIOMIXBUF_S2B(pMixBuf, cLenSrc1 + cLenSrc2), rc)); + AUDMIXBUF_LOG(("cRead=%RU32 (%zu bytes), rc=%Rrc\n", + cLenSrc1 + cLenSrc2, + AUDIOMIXBUF_S2B(pMixBuf, cLenSrc1 + cLenSrc2), rc)); return rc; } @@ -1029,5 +1034,5 @@ AssertPtrReturnVoid(pMixBuf); - LogFlowFunc(("%s\n", pMixBuf->pszName)); + AUDMIXBUF_LOG(("%s\n", pMixBuf->pszName)); pMixBuf->offReadWrite = 0; @@ -1059,10 +1064,10 @@ return; - LogFlowFunc(("%s\n", pMixBuf->pszName)); + AUDMIXBUF_LOG(("%s\n", pMixBuf->pszName)); if (pMixBuf->pParent) { - LogFlowFunc(("%s: Unlinking from parent \"%s\"\n", - pMixBuf->pszName, pMixBuf->pParent->pszName)); + AUDMIXBUF_LOG(("%s: Unlinking from parent \"%s\"\n", + pMixBuf->pszName, pMixBuf->pParent->pszName)); RTListNodeRemove(&pMixBuf->Node); @@ -1079,5 +1084,5 @@ pIter = RTListGetFirst(&pMixBuf->lstBuffers, PDMAUDIOMIXBUF, Node); - LogFlowFunc(("\tUnlinking \"%s\"\n", pIter->pszName)); + AUDMIXBUF_LOG(("\tUnlinking \"%s\"\n", pIter->pszName)); audioMixBufReset(pIter->pParent); @@ -1134,6 +1139,6 @@ cToProcess = RT_MIN(cToProcess, AUDIOMIXBUF_B2S(pMixBuf, cbBuf)); - LogFlowFunc(("%s: offSamples=%RU32, cLive=%RU32, cDead=%RU32, cToProcess=%RU32\n", - pMixBuf->pszName, offSamples, cLive, cDead, cToProcess)); + AUDMIXBUF_LOG(("%s: offSamples=%RU32, cLive=%RU32, cDead=%RU32, cToProcess=%RU32\n", + pMixBuf->pszName, offSamples, cLive, cDead, cToProcess)); if (offSamples + cToProcess > pMixBuf->cSamples) @@ -1173,5 +1178,5 @@ } - LogFlowFunc(("cWritten=%RU32, rc=%Rrc\n", cWritten, rc)); + AUDMIXBUF_LOG(("cWritten=%RU32, rc=%Rrc\n", cWritten, rc)); return rc; } @@ -1201,6 +1206,6 @@ PPDMAUDIOMIXBUF pParent = pMixBuf->pParent; - LogFlowFunc(("%s: enmFmt=%ld, pBuf=%p, cbBuf=%zu, pParent=%p (%RU32)\n", - pMixBuf->pszName, enmFmt, pvBuf, cbBuf, pParent, pParent ? pParent->cSamples : 0)); + AUDMIXBUF_LOG(("%s: enmFmt=%ld, pBuf=%p, cbBuf=%zu, pParent=%p (%RU32)\n", + pMixBuf->pszName, enmFmt, pvBuf, cbBuf, pParent, pParent ? pParent->cSamples : 0)); if ( pParent @@ -1210,6 +1215,6 @@ *pcWritten = 0; - LogFlowFunc(("%s: Parent buffer %s is full\n", - pMixBuf->pszName, pMixBuf->pParent->pszName)); + AUDMIXBUF_LOG(("%s: Parent buffer %s is full\n", + pMixBuf->pszName, pMixBuf->pParent->pszName)); return VINF_SUCCESS; @@ -1269,6 +1274,6 @@ #endif - LogFlowFunc(("cLenDst1=%RU32, cLenDst2=%RU32, offWrite=%RU32\n", - cLenDst1, cLenDst2, offWrite)); + AUDMIXBUF_LOG(("cLenDst1=%RU32, cLenDst2=%RU32, offWrite=%RU32\n", + cLenDst1, cLenDst2, offWrite)); if (RT_SUCCESS(rc)) @@ -1283,7 +1288,7 @@ audioMixBufPrint(pMixBuf); - LogFlowFunc(("cWritten=%RU32 (%zu bytes), rc=%Rrc\n", - cLenDst1 + cLenDst2, - AUDIOMIXBUF_S2B(pMixBuf, cLenDst1 + cLenDst2), rc)); + AUDMIXBUF_LOG(("cWritten=%RU32 (%zu bytes), rc=%Rrc\n", + cLenDst1 + cLenDst2, + AUDIOMIXBUF_S2B(pMixBuf, cLenDst1 + cLenDst2), rc)); return rc; }