Changeset 87436 in vbox

Timestamp:

Jan 26, 2021 4:59:29 PM (4 years ago)

Author:

vboxsync

Message:

Audio/HDA+AC97: Made the device emulation's internal [in|out]put FIFO buffer size configurable via extra data "VBoxInternal2/Audio/Device/BufSize[In|Out]Ms" (optional, defaults to 1000ms if not set). ticketoem2ref:36

Location:

trunk/src/VBox

Files:

• Devices/Audio/DevHDA.cpp (modified) (2 diffs)
• Devices/Audio/DevHDA.h (modified) (1 diff)
• Devices/Audio/DrvAudio.h (modified) (1 diff)
• Devices/Audio/DrvAudioCommon.cpp (modified) (2 diffs)
• Devices/Audio/HDAStream.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -1469 +1469 @@
                              uSD, cTicksToNext / 1000,  cTicksElapsed / 1000, pStreamShared->State.cTransferPendingInterrupts));
 
-            cTicksToNext = 0;
+            cTicksToNext = pStreamShared->State.cTransferTicks;
         }
 
@@ -4596 +4596 @@
      * Validate and read configuration.
      */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "TimerHz|PosAdjustEnabled|PosAdjustFrames|DebugEnabled|DebugPathOut", "");
-
-    int rc = pHlp->pfnCFGMQueryU16Def(pCfg, "TimerHz", &pThis->uTimerHz, HDA_TIMER_HZ_DEFAULT /* Default value, if not set. */);
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "BufSizeInMs|BufSizeOutMs|TimerHz|PosAdjustEnabled|PosAdjustFrames|DebugEnabled|DebugPathOut", "");
+
+    /* Note: Error checking of this value happens in hdaR3StreamSetUp(). */
+    int rc = pHlp->pfnCFGMQueryU16Def(pCfg, "BufSizeInMs", &pThis->cbCircBufInMs, RT_MS_1SEC /* Default value, if not set. */);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("HDA configuration error: failed to read input buffer size (ms) as unsigned integer"));
+
+    /* Note: Error checking of this value happens in hdaR3StreamSetUp(). */
+    rc = pHlp->pfnCFGMQueryU16Def(pCfg, "BufSizeOutMs", &pThis->cbCircBufOutMs, RT_MS_1SEC /* Default value, if not set. */);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("HDA configuration error: failed to read output buffer size (ms) as unsigned integer"));
+
+    rc = pHlp->pfnCFGMQueryU16Def(pCfg, "TimerHz", &pThis->uTimerHz, HDA_TIMER_HZ_DEFAULT /* Default value, if not set. */);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

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

@@ -122 +122 @@
     /** The device timer Hz rate. Defaults to HDA_TIMER_HZ_DEFAULT. */
     uint16_t                uTimerHz;
+    /** Buffer size (in ms) of the internal input FIFO buffer.
+     *  The actual buffer size in bytes will depend on the actual stream configuration. */
+    uint16_t                cbCircBufInMs;
+    /** Buffer size (in ms) of the internal output FIFO buffer.
+     *  The actual buffer size in bytes will depend on the actual stream configuration. */
+    uint16_t                cbCircBufOutMs;
     /** Padding for alignment. */
-    uint16_t                au16Padding3[3];
+    uint16_t                u16Padding3;
     /** Last updated wall clock (WALCLK) counter. */
     uint64_t                u64WalClk;

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

@@ -195 +195 @@
 uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels);
 uint32_t DrvAudioHlpCalcBitrate(const PPDMAUDIOPCMPROPS pProps);
-uint32_t DrvAudioHlpBytesAlign(uint32_t cbSize, const PPDMAUDIOPCMPROPS pProps);
-bool     DrvAudioHlpBytesIsAligned(uint32_t cbSize, const PPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpBytesAlign(size_t cbSize, const PPDMAUDIOPCMPROPS pProps);
+bool     DrvAudioHlpBytesIsAligned(size_t cbSize, const PPDMAUDIOPCMPROPS pProps);
 uint32_t DrvAudioHlpBytesToFrames(uint32_t cbBytes, const PPDMAUDIOPCMPROPS pProps);
 uint64_t DrvAudioHlpBytesToMilli(uint32_t cbBytes, const PPDMAUDIOPCMPROPS pProps);

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

@@ -1181 +1181 @@
  * @param   pProps              PCM properties to align size to.
  */
-uint32_t DrvAudioHlpBytesAlign(uint32_t cbSize, const PPDMAUDIOPCMPROPS pProps)
+uint32_t DrvAudioHlpBytesAlign(size_t cbSize, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);
@@ -1198 +1198 @@
  * @param   pProps              PCM properties to use for checking the alignment.
  */
-bool DrvAudioHlpBytesIsAligned(uint32_t cbSize, const PPDMAUDIOPCMPROPS pProps)
+bool DrvAudioHlpBytesIsAligned(size_t cbSize, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);

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

@@ -361 +361 @@
     }
 
-    /* By default we allocate an internal buffer of 100ms. */
-    rc = RTCircBufCreate(&pStreamR3->State.pCircBuf,
-                         DrvAudioHlpMilliToBytes(100 /* ms */, &pCfg->Props)); /** @todo Make this configurable. */
+    const size_t cbCircBufDefault = DrvAudioHlpMilliToBytes(RT_MS_1SEC, &pCfg->Props);
+
+    size_t cbCircBuf = DrvAudioHlpMilliToBytes(  hdaGetDirFromSD(uSD) == PDMAUDIODIR_IN
+                                               ? pThis->cbCircBufInMs : pThis->cbCircBufOutMs, &pCfg->Props);
+
+    ASSERT_GUEST_LOGREL_MSG_STMT(cbCircBuf,
+                                 ("Ring buffer size for stream #%RU8 is invalid (%zu), setting to default\n", uSD, cbCircBuf),
+                                 cbCircBuf = cbCircBufDefault);
+    ASSERT_GUEST_LOGREL_MSG_STMT(DrvAudioHlpBytesIsAligned(cbCircBuf, &pCfg->Props),
+                                 ("Ring buffer size for stream #%RU8 is misaligned (%zu), setting to default\n", uSD, cbCircBuf),
+                                 cbCircBuf = cbCircBufDefault);
+
+    if (cbCircBuf != cbCircBufDefault)
+        LogRel2(("HDA: Stream #%RU8 is using a custom ring buffer size of %RU64ms (%zu bytes)\n",
+                 uSD, DrvAudioHlpBytesToMilli(cbCircBuf, &pCfg->Props), cbCircBuf));
+
+    rc = RTCircBufCreate(&pStreamR3->State.pCircBuf, cbCircBuf);
     AssertRCReturn(rc, rc);
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2962 +2962 @@
             const uint64_t uTimerHz = strTmp.toUInt64();
 
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/Audio/Device/BufSizeInMs", &strTmp);
+            const uint64_t uBufSizeInMs = strTmp.toUInt64();
+
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/Audio/Device/BufSizeOutMs", &strTmp);
+            const uint64_t uBufSizeOutMs = strTmp.toUInt64();
+
             GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/Audio/Debug/Enabled", &strTmp);
             const bool fDebugEnabled = strTmp.equalsIgnoreCase("true") || strTmp.equalsIgnoreCase("1");
@@ -2996 +3002 @@
                     if (uTimerHz)
                         InsertConfigInteger(pCfg,   "TimerHz",              uTimerHz);
+                    if (uBufSizeInMs)
+                        InsertConfigInteger(pCfg,   "BufSizeInMs",          uBufSizeInMs);
+                    if (uBufSizeOutMs)
+                        InsertConfigInteger(pCfg,   "BufSizeOutMs",         uBufSizeOutMs);
                     InsertConfigInteger(pCfg,       "DebugEnabled",         fDebugEnabled);
                     if (strDebugPathOut.isNotEmpty())
@@ -3031 +3041 @@
                     if (uTimerHz)
                         InsertConfigInteger(pCfg,   "TimerHz",              uTimerHz);
+                    if (uBufSizeInMs)
+                        InsertConfigInteger(pCfg,   "BufSizeInMs",          uBufSizeInMs);
+                    if (uBufSizeOutMs)
+                        InsertConfigInteger(pCfg,   "BufSizeOutMs",         uBufSizeOutMs);
                     InsertConfigInteger(pCfg,       "DebugEnabled",         fDebugEnabled);
                     if (strDebugPathOut.isNotEmpty())