Changeset 70639 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 19, 2018 12:03:12 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Implemented more dynamic support for attaching the host backends to its audio connector at runtime.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (7 diffs)
• DrvAudio.h (modified) (1 diff)

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

@@ -2213 +2213 @@
 #endif
 
-    int rc2 = CFGMR3QueryString(pCfgHandle, "DriverName", pThis->szName, sizeof(pThis->szName));
+    pThis->fTerminate = false;
+    pThis->pCFGMNode  = pCfgHandle;
+
+    int rc2 = CFGMR3QueryString(pThis->pCFGMNode, "DriverName", pThis->szName, sizeof(pThis->szName));
     if (RT_FAILURE(rc2))
         RTStrPrintf(pThis->szName, sizeof(pThis->szName), "Untitled");
 
     /* By default we don't enable anything if wrongly / not set-up. */
-    CFGMR3QueryBoolDef(pCfgHandle, "InputEnabled",  &pThis->In.fEnabled,   false);
-    CFGMR3QueryBoolDef(pCfgHandle, "OutputEnabled", &pThis->Out.fEnabled,  false);
-
-    CFGMR3QueryBoolDef(pCfgHandle, "DebugEnabled",      &pThis->Dbg.fEnabled,  false);
-    rc2 = CFGMR3QueryString(pCfgHandle, "DebugPathOut", pThis->Dbg.szPathOut, sizeof(pThis->Dbg.szPathOut));
+    CFGMR3QueryBoolDef(pThis->pCFGMNode, "InputEnabled",  &pThis->In.fEnabled,   false);
+    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));
     if (   RT_FAILURE(rc2)
         || !strlen(pThis->Dbg.szPathOut))
@@ -2235 +2238 @@
              pThis->szName, pThis->In.fEnabled ? "enabled" : "disabled", pThis->Out.fEnabled ? "enabled" : "disabled"));
 
-    /*
-     * If everything went well, initialize the lower driver.
-     */
-    rc = drvAudioHostInit(pThis, pCfgHandle);
-
-    LogFlowFuncLeaveRC(rc);
+    LogFunc(("[%s] rc=%Rrc\n", pThis->szName, rc));
     return rc;
 }
@@ -3199 +3197 @@
 }
 
+/**
+ * Does the actual backend driver attaching and queries the backend's interface.
+ *
+ * @return VBox status code.
+ * @param  pThis                Pointer to driver instance.
+ * @param  fFlags               Attach flags; see PDMDrvHlpAttach().
+ */
+static int drvAudioDoAttachInternal(PDRVAUDIO pThis, uint32_t fFlags)
+{
+    Assert(pThis->pHostDrvAudio == NULL); /* No nested attaching. */
+
+    /*
+     * Attach driver below and query its connector interface.
+     */
+    PPDMIBASE pDownBase;
+    int rc = PDMDrvHlpAttach(pThis->pDrvIns, fFlags, &pDownBase);
+    if (RT_SUCCESS(rc))
+    {
+        pThis->pHostDrvAudio = PDMIBASE_QUERY_INTERFACE(pDownBase, PDMIHOSTAUDIO);
+        if (!pThis->pHostDrvAudio)
+        {
+            LogRel(("Audio: Failed to query interface for underlying host driver\n"));
+            rc = PDMDRV_SET_ERROR(pThis->pDrvIns, VERR_PDM_MISSING_INTERFACE_BELOW,
+                                  N_("Host audio backend missing or invalid"));
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * If everything went well, initialize the lower driver.
+         */
+        AssertPtr(pThis->pCFGMNode);
+        rc = drvAudioHostInit(pThis, pThis->pCFGMNode);
+    }
+
+    LogFunc(("[%s] rc=%Rrc\n", pThis->szName, rc));
+    return rc;
+}
+
+
 /********************************************************************/
 
@@ -3227 +3266 @@
 
     LogFlowFuncEnter();
+
+    if (!pThis->pHostDrvAudio) /* If not lower driver is configured, bail out. */
+        return;
 
     /* Just destroy the host stream on the backend side.
@@ -3295 +3337 @@
 #endif
 
-    /*
-     * Attach driver below and query its connector interface.
-     */
-    PPDMIBASE pDownBase;
-    int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pDownBase);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("Audio: Failed to attach to driver %p below (flags=0x%x), rc=%Rrc\n",
-                pDrvIns, fFlags, rc));
-        return rc;
-    }
-
-    pThis->pHostDrvAudio = PDMIBASE_QUERY_INTERFACE(pDownBase, PDMIHOSTAUDIO);
-    if (!pThis->pHostDrvAudio)
-    {
-        LogRel(("Audio: Failed to query interface for underlying host driver\n"));
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_BELOW,
-                                N_("Host audio backend missing or invalid"));
-    }
-
-    rc = drvAudioInit(pDrvIns, pCfg);
+    int rc = drvAudioInit(pDrvIns, pCfg);
     if (RT_SUCCESS(rc))
     {
-        pThis->fTerminate = false;
-        pThis->pDrvIns    = pDrvIns;
-
 #ifdef VBOX_WITH_STATISTICS
         PDMDrvHlpSTAMRegCounterEx(pDrvIns, &pThis->Stats.TotalStreamsActive,   "TotalStreamsActive",
@@ -3354 +3373 @@
     }
 
+    rc = drvAudioDoAttachInternal(pThis, fFlags);
+    if (RT_FAILURE(rc))
+    {
+        /* No lower attached driver (yet)? Not a failure, might get attached later at runtime, just skip. */
+        if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+            rc = VINF_SUCCESS;
+    }
+
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -3497 +3524 @@
     AssertRC(rc2);
 
-    int rc = VINF_SUCCESS;
-
     LogFunc(("%s\n", pThis->szName));
+
+    int rc = drvAudioDoAttachInternal(pThis, fFlags);
 
     rc2 = RTCritSectLeave(&pThis->CritSect);

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

@@ -93 +93 @@
     /** Pointer to audio driver below us. */
     PPDMIHOSTAUDIO          pHostDrvAudio;
+    /** Pointer to CFGM configuration node of this driver. */
+    PCFGMNODE               pCFGMNode;
     /** List of host input/output audio streams. */
     RTLISTANCHOR            lstHstStreams;