Changeset 73230 in vbox

Timestamp:

Jul 19, 2018 9:53:50 AM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Added DRVAUDIOCFG to allow tweaking an audio driver via CFGM and added support for separate configurations for both, input and output streams. See comments for actual tweakables.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (12 diffs)
• DrvAudio.h (modified) (3 diffs)

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

@@ -961 +961 @@
         }
 
-        if (pThis->Dbg.fEnabled)
+        if (pThis->Out.Cfg.Dbg.fEnabled)
             DrvAudioHlpFileWrite(pHstStream->Out.Dbg.pFileStreamWrite, pvBuf, cbBuf, 0 /* fFlags */);
 
@@ -1326 +1326 @@
                     && cbPlayed)
                 {
-                    if (pThis->Dbg.fEnabled)
+                    if (pThis->Out.Cfg.Dbg.fEnabled)
                         DrvAudioHlpFileWrite(pHstStream->Out.Dbg.pFilePlayNonInterleaved, auBuf, cbPlayed, 0 /* fFlags */);
 
@@ -1634 +1634 @@
         else if (cbCaptured)
         {
-            if (pThis->Dbg.fEnabled)
+            if (pThis->In.Cfg.Dbg.fEnabled)
                 DrvAudioHlpFileWrite(pHstStream->In.Dbg.pFileCaptureNonInterleaved, auBuf, cbCaptured, 0 /* fFlags */);
 
@@ -2210 +2210 @@
 
     /*
-     * Configure driver from CFGM stuff.
+     * Configure driver from CFGM.
      */
 #ifdef DEBUG
@@ -2227 +2227 @@
     CFGMR3QueryBoolDef(pThis->pCFGMNode, "OutputEnabled", &pThis->Out.fEnabled,  false);
 
-    CFGMR3QueryBoolDef(pThis->pCFGMNode, "DebugEnabled",      &pThis->Dbg.fEnabled,  false);
-    rc2 = CFGMR3QueryString(pThis->pCFGMNode, "DebugPathOut", pThis->Dbg.szPathOut, sizeof(pThis->Dbg.szPathOut));
+    /* Input configuration. */
+    /** @todo Separate debugging stuff if needed. Later. */
+    CFGMR3QueryBoolDef(pThis->pCFGMNode, "DebugEnabled",      &pThis->In.Cfg.Dbg.fEnabled,  false);
+    rc2 = CFGMR3QueryString(pThis->pCFGMNode, "DebugPathOut", pThis->In.Cfg.Dbg.szPathOut, sizeof(pThis->In.Cfg.Dbg.szPathOut));
     if (   RT_FAILURE(rc2)
-        || !strlen(pThis->Dbg.szPathOut))
-    {
-        RTStrPrintf(pThis->Dbg.szPathOut, sizeof(pThis->Dbg.szPathOut), VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH);
-    }
-
-    if (pThis->Dbg.fEnabled)
-        LogRel(("Audio: Debugging enabled (audio data written to '%s')\n", pThis->Dbg.szPathOut));
+        || !strlen(pThis->In.Cfg.Dbg.szPathOut))
+    {
+        RTStrPrintf(pThis->In.Cfg.Dbg.szPathOut, sizeof(pThis->In.Cfg.Dbg.szPathOut), VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH);
+    }
+
+    if (pThis->In.Cfg.Dbg.fEnabled)
+        LogRel(("Audio: Debugging input enabled (audio data written to '%s')\n", pThis->In.Cfg.Dbg.szPathOut));
+
+    /* Output configuration. */
+    CFGMR3QueryBoolDef(pThis->pCFGMNode, "DebugEnabled",      &pThis->Out.Cfg.Dbg.fEnabled, false);
+    rc2 = CFGMR3QueryString(pThis->pCFGMNode, "DebugPathOut", pThis->Out.Cfg.Dbg.szPathOut, sizeof(pThis->Out.Cfg.Dbg.szPathOut));
+    if (   RT_FAILURE(rc2)
+        || !strlen(pThis->Out.Cfg.Dbg.szPathOut))
+    {
+        RTStrPrintf(pThis->Out.Cfg.Dbg.szPathOut, sizeof(pThis->Out.Cfg.Dbg.szPathOut), VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH);
+    }
+
+    if (pThis->Out.Cfg.Dbg.fEnabled)
+        LogRel(("Audio: Debugging output enabled (audio data written to '%s')\n", pThis->Out.Cfg.Dbg.szPathOut));
 
     LogRel2(("Audio: Initial status for driver '%s': Input is %s, output is %s\n",
@@ -2327 +2341 @@
         if (cReadTotal)
         {
-            if (pThis->Dbg.fEnabled)
+            if (pThis->In.Cfg.Dbg.fEnabled)
                 DrvAudioHlpFileWrite(pHstStream->In.Dbg.pFileStreamRead,
                                      pvBuf, AUDIOMIXBUF_F2B(&pGstStream->MixBuf, cReadTotal), 0 /* fFlags */);
@@ -2558 +2572 @@
         if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
-            if (pThis->Dbg.fEnabled)
+            if (pThis->In.Cfg.Dbg.fEnabled)
             {
                 char szFile[RTPATH_MAX + 1];
 
-                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Dbg.szPathOut, "CaptureNonInterleaved",
+                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "CaptureNonInterleaved",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                 if (RT_SUCCESS(rc2))
@@ -2575 +2589 @@
                 if (RT_SUCCESS(rc2))
                 {
-                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Dbg.szPathOut, "StreamRead",
+                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "StreamRead",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                     if (RT_SUCCESS(rc2))
@@ -2593 +2607 @@
         else /* Out */
         {
-            if (pThis->Dbg.fEnabled)
+            if (pThis->Out.Cfg.Dbg.fEnabled)
             {
                 char szFile[RTPATH_MAX + 1];
 
-                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Dbg.szPathOut, "PlayNonInterleaved",
+                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "PlayNonInterleaved",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                 if (RT_SUCCESS(rc2))
@@ -2610 +2624 @@
                 if (RT_SUCCESS(rc2))
                 {
-                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Dbg.szPathOut, "StreamWrite",
+                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "StreamWrite",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                     if (RT_SUCCESS(rc2))
@@ -2961 +2975 @@
                     PDMDrvHlpSTAMDeregister(pThis->pDrvIns, &pHstStream->In.StatFramesCaptured);
 #endif
-                    if (pThis->Dbg.fEnabled)
+                    if (pThis->In.Cfg.Dbg.fEnabled)
                     {
                         DrvAudioHlpFileDestroy(pHstStream->In.Dbg.pFileCaptureNonInterleaved);
@@ -2972 +2986 @@
                     PDMDrvHlpSTAMDeregister(pThis->pDrvIns, &pHstStream->Out.StatFramesPlayed);
 #endif
-                    if (pThis->Dbg.fEnabled)
+                    if (pThis->Out.Cfg.Dbg.fEnabled)
                     {
                         DrvAudioHlpFileDestroy(pHstStream->Out.Dbg.pFilePlayNonInterleaved);

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

@@ -73 +73 @@
 } DRVAUDIOSTATS, *PDRVAUDIOSTATS;
 #endif
+
+/**
+ * Audio driver configuration data, tweakable via CFGM.
+ */
+typedef struct DRVAUDIOCFG
+{
+    /** Configures the period size (in audio frames).
+     *  This value reflects the number of audio frames in between each hardware interrupt on the
+     *  backend (host) side. */
+    uint32_t             cfPeriod;
+    /** Configures the (ring) buffer size (in audio frames). Often is a multiple of cfPeriod. */
+    uint32_t             cfBufferSize;
+    /** Configures the 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. */
+    uint32_t             cfPreBuf;
+    /** The driver's debugging configuration. */
+    struct
+    {
+        /** Whether audio debugging is enabled or not. */
+        bool             fEnabled;
+        /** Where to store the debugging files.
+         *  Defaults to VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH if not set. */
+        char             szPathOut[RTPATH_MAX + 1];
+    } Dbg;
+} DRVAUDIOCFG, *PDRVAUDIOCFG;
 
 /**
@@ -120 +146 @@
         RTLISTANCHOR        lstCB;
 #endif
+        /** The driver's input confguration (tweakable via CFGM). */
+        DRVAUDIOCFG         Cfg;
     } In;
     struct
@@ -132 +160 @@
         RTLISTANCHOR        lstCB;
 #endif
+        /** The driver's output confguration (tweakable via CFGM). */
+        DRVAUDIOCFG         Cfg;
     } Out;
-    struct
-    {
-        /** Whether audio debugging is enabled or not. */
-        bool                    fEnabled;
-        /** Where to store the debugging files.
-         *  Defaults to VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH if not set. */
-        char                    szPathOut[RTPATH_MAX + 1];
-    } Dbg;
 } DRVAUDIO, *PDRVAUDIO;