Changeset 73241 in vbox

Timestamp:

Jul 19, 2018 2:56:24 PM (7 years ago)

Author:

vboxsync

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

123846

Message:

Audio/PDM: Added (tweakable) parameters to the audio stream configuration and give the audio connector(s) a scheduling hint from the device emulation(s), if available.

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/HDAStream.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/HDAStream.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -535 +535 @@
      *      The audio data will get handled as PDMAUDIOFRAME frames without any modification done. */
     PDMAUDIOSTREAMLAYOUT     enmLayout;
-    /** Hint about the optimal frame buffer size (in audio frames).
-     *  0 if no hint is given. */
-    uint32_t                 cFrameBufferHint;
+    struct
+    {
+        /** Scheduling hint given from the device emulation about when this stream is being served on average.
+         *  Can be 0 if not hint given or some other mechanism (e.g. callbacks) is being used. */
+        uint32_t             uSchedulingHintMs;
+    } Device;
+    /**
+     * Backend-specific data for the stream.
+     * Set by the backend on return. Not all backends support all values / features.
+     */
+    struct
+    {
+        /** Period size of the stream (in audio frames).
+         *  This value reflects the number of audio frames in between each hardware interrupt on the
+         *  backend (host) side. 0 if not set / available by the backend. */
+        uint32_t             cfPeriod;
+        /** (Ring) buffer size (in audio frames). Often is a multiple of cfPeriod.
+         *  0 if not set / available by the backend. */
+        uint32_t             cfBufferSize;
+        /** Pre-buffering size (in audio frames). Frames needed in buffer before the stream becomes active (pre buffering).
+         *  The bigger this value is, the more latency for the stream will occur.
+         *  0 if not set / available by the backend. */
+        uint32_t             cfPreBuf;
+    } Backend;
 } PDMAUDIOSTREAMCFG;
 AssertCompileSizeAlignment(PDMAUDIOPCMPROPS, 8);

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

@@ -312 +312 @@
 #endif
     /** The stream's current configuration. */
-    PDMAUDIOSTREAMCFG     Cfg; //+96
+    PDMAUDIOSTREAMCFG     Cfg; //+100
+    uint32_t              Padding;
 #ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
     /** Asynchronous I/O state members. */
@@ -1687 +1688 @@
     AssertCompile(sizeof(pCfg->szName) >= 8);
 
+    /* Set scheduling hint (if available). */
+    if (pThis->cTimerTicks)
+        pCfg->Device.uSchedulingHintMs = 1000 /* ms */ / (TMTimerGetFreq(pThis->pTimerR3) / pThis->cTimerTicks);
+
     switch (pStream->u8SD)
     {

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

@@ -2144 +2144 @@
     if (RT_FAILURE(rc))
         return rc;
+
+    /* Set scheduling hint (if available). */
+    if (pThis->cTimerTicksIO)
+        pThis->Out.Cfg.Device.uSchedulingHintMs = 1000 /* ms */ / (TMTimerGetFreq(pThis->pTimerIO) / pThis->cTimerTicksIO);
 
     PSB16DRIVER pDrv;

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

@@ -194 +194 @@
         return rc;
     }
+
+    /* Set scheduling hint (if available). */
+    if (pThis->u16TimerHz)
+        pCfg->Device.uSchedulingHintMs = 1000 /*ms */ / pThis->u16TimerHz;
 
     /* (Re-)Allocate the stream's internal DMA buffer, based on the PCM  properties we just got above. */

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

@@ -165 +165 @@
      *  Should match SDFMT. */
     PDMAUDIOSTREAMCFG       Cfg;
+    uint32_t                aPadding3;
 #ifdef HDA_USE_DMA_ACCESS_HANDLER
     /** List of DMA handlers. */
@@ -175 +176 @@
     uint16_t                cbDMALeft;
     /** Unused, padding. */
-    uint8_t                 abPadding3[2+4];
+    uint8_t                 abPadding4[2+4];
 } HDASTREAMSTATE;
 AssertCompileSizeAlignment(HDASTREAMSTATE, 8);