vbox的更動 75962 路徑 trunk/src/VBox/Devices/Audio/HDAStreamChannel.cpp

時間撮記:

2018-12-5 上午09:34:58 (6 年 以前)

作者:

vboxsync

訊息:

Forward ported r127158 (Audio/HDA: Implemented support for Windows 10 Build 1809 default surround speaker setup) + build fixes (r127159, r127160, r127162, r127165, r127167).

檔案:

• trunk/src/VBox/Devices/Audio/HDAStreamChannel.cpp (修改) (1 筆差異)

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

@@ -66 +66 @@
 
 /**
- * Extracts HDA audio stream data and stores it into the given stream channel data block.
- *
- * @returns IPRT status code.
- * @param   pChan               Channel data to extract audio stream data into.
- * @param   pvBuf               Buffer of audio data to extract.
- * @param   cbBuf               Size (in bytes) of audio data to extract.
- */
-int hdaR3StreamChannelExtract(PPDMAUDIOSTREAMCHANNEL pChan, const void *pvBuf, size_t cbBuf)
-{
-    AssertPtrReturn(pChan, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbBuf,    VERR_INVALID_PARAMETER);
-
-    AssertRelease(pChan->cbOff <= cbBuf);
-
-    const uint8_t *pu8Buf = (const uint8_t *)pvBuf;
-
-    size_t         cbSrc = cbBuf - pChan->cbOff;
-    const uint8_t *pvSrc = &pu8Buf[pChan->cbOff];
-
-    size_t         cbDst;
-    uint8_t       *pvDst;
-    RTCircBufAcquireWriteBlock(pChan->Data.pCircBuf, cbBuf, (void **)&pvDst, &cbDst);
-
-    cbSrc = RT_MIN(cbSrc, cbDst);
-
-    while (cbSrc)
-    {
-        AssertBreak(cbDst >= cbSrc);
-
-        /* Enough data for at least one next frame? */
-        if (cbSrc < pChan->cbFrame)
-            break;
-
-        memcpy(pvDst, pvSrc, pChan->cbFrame);
-
-        /* Advance to next channel frame in stream. */
-        pvSrc        += pChan->cbStep;
-        Assert(cbSrc >= pChan->cbStep);
-        cbSrc        -= pChan->cbStep;
-
-        /* Advance destination by one frame. */
-        pvDst        += pChan->cbFrame;
-        Assert(cbDst >= pChan->cbFrame);
-        cbDst        -= pChan->cbFrame;
-
-        /* Adjust offset. */
-        pChan->cbOff += pChan->cbFrame;
-    }
-
-    RTCircBufReleaseWriteBlock(pChan->Data.pCircBuf, cbDst);
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Advances the current read / write pointer by a certain amount.
- *
- * @returns IPRT status code.
- * @param   pChan               Channel data to advance read / write pointer for.
- * @param   cbAdv               Amount (in bytes) to advance read / write pointer.
- *
- * @remark  Currently not used / implemented.
- */
-int hdaR3StreamChannelAdvance(PPDMAUDIOSTREAMCHANNEL pChan, size_t cbAdv)
-{
-    AssertPtrReturn(pChan, VERR_INVALID_POINTER);
-
-    if (!cbAdv)
-        return VINF_SUCCESS;
-
-    return VINF_SUCCESS;
-}
-
-/**
  * Acquires (reads) audio channel data.
  * Must be released when done with hdaR3StreamChannelReleaseData().