Changeset 87267 in vbox

Timestamp:

Jan 15, 2021 12:43:52 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142226

Message:

Audio/HDA: Added a per-stream FIFOS scratch buffer to avoid intermediate (re-)allocations. ticketoem2ref:36

Location:

trunk/src/VBox/Devices/Audio

Files:

• HDAStream.cpp (modified) (9 diffs)
• HDAStream.h (modified) (1 diff)

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

@@ -1018 +1018 @@
     uint32_t cbLeft      = cbToProcess;
 
-    uint8_t abChunk[HDA_FIFO_MAX + 1];
     while (cbLeft)
     {
@@ -1040 +1039 @@
         uint32_t   cbDMA    = 0;
         PRTCIRCBUF pCircBuf = pStreamR3->State.pCircBuf;
+        uint8_t   *pabFIFO  = pStreamShared->abFIFO;
 
         if (hdaGetDirFromSD(uSD) == PDMAUDIODIR_IN) /* Input (SDI). */
@@ -1059 +1059 @@
                     break;
 
-                memcpy(abChunk + cbDMAWritten, pvBuf, cbBuf);
+                memcpy(pabFIFO + cbDMAWritten, pvBuf, cbBuf);
 
                 RTCircBufReleaseReadBlock(pCircBuf, cbBuf);
@@ -1074 +1074 @@
 
                 Assert(cbChunk == cbDMAWritten + cbDMAToWrite);
-                memset((uint8_t *)abChunk + cbDMAWritten, 0, cbDMAToWrite);
+                memset((uint8_t *)pabFIFO + cbDMAWritten, 0, cbDMAToWrite);
                 cbDMAWritten = cbChunk;
             }
 
-            rc = hdaR3DMAWrite(pDevIns, pThis, pStreamShared, pStreamR3, abChunk, cbDMAWritten, &cbDMA /* pcbWritten */);
+            rc = hdaR3DMAWrite(pDevIns, pThis, pStreamShared, pStreamR3, pabFIFO, cbDMAWritten, &cbDMA /* pcbWritten */);
             if (RT_FAILURE(rc))
                 LogRel(("HDA: Writing to stream #%RU8 DMA failed with %Rrc\n", uSD, rc));
@@ -1088 +1088 @@
             STAM_PROFILE_START(&pThis->StatOut, a);
 
-            rc = hdaR3DMARead(pDevIns, pThis, pStreamShared, pStreamR3, abChunk, cbChunk, &cbDMA /* pcbRead */);
+            rc = hdaR3DMARead(pDevIns, pThis, pStreamShared, pStreamR3, pabFIFO, cbChunk, &cbDMA /* pcbRead */);
             if (RT_SUCCESS(rc))
             {
@@ -1112 +1112 @@
                         if (cbBuf)
                         {
-                            memcpy(pvBuf, abChunk + cbDMARead, cbBuf);
+                            memcpy(pvBuf, pabFIFO + cbDMARead, cbBuf);
                             cbDMARead += (uint32_t)cbBuf;
                             cbDMALeft -= (uint32_t)cbBuf;
@@ -1160 +1160 @@
                         }
 
-                        uint8_t *pbSrcBuf = abChunk;
+                        uint8_t *pbSrcBuf = pabFIFO;
                         size_t cbSrcOff   = pMap->offNext;
 
@@ -1558 +1558 @@
             if (cbSinkReadable)
             {
-                uint8_t abFIFO[HDA_FIFO_MAX + 1];
+                uint8_t *pabFIFO = pStreamShared->abFIFO;
+
                 while (cbSinkReadable)
                 {
                     uint32_t cbRead;
                     rc2 = AudioMixerSinkRead(pSink, AUDMIXOP_COPY,
-                                             abFIFO, RT_MIN(cbSinkReadable, (uint32_t)sizeof(abFIFO)), &cbRead);
+                                             pabFIFO, RT_MIN(cbSinkReadable, (uint32_t)sizeof(pStreamShared->abFIFO)), &cbRead);
                     AssertRCBreak(rc2);
 
@@ -1574 +1575 @@
                     /* Write (guest input) data to the stream which was read from stream's sink before. */
                     uint32_t cbWritten;
-                    rc2 = hdaR3StreamWrite(pStreamR3, abFIFO, cbRead, &cbWritten);
+                    rc2 = hdaR3StreamWrite(pStreamR3, pabFIFO, cbRead, &cbWritten);
                     AssertRCBreak(rc2);
                     AssertBreak(cbWritten > 0); /* Should never happen, as we know how much we can write. */

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

@@ -211 +211 @@
     /** FIFO Watermark. */
     uint16_t                    u16FIFOW;
+    /** FIFO scratch buffer, to avoid intermediate (re-)allocations. */
+    uint8_t                     abFIFO[HDA_FIFO_MAX + 1];
     /** Last Valid Index (SDnLVI).
      *  Will be updated in hdaR3StreamInit(). */