Changeset 70644 in vbox

Timestamp:

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

Author:

vboxsync

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

120374

Message:

Audio/Main: More code needed for attaching / detaching host backends at runtime.

Location:

trunk/src/VBox/Main

Files:

• include/AudioDriver.h (modified) (5 diffs)
• include/DrvAudioVRDE.h (modified) (1 diff)
• include/DrvAudioVideoRec.h (modified) (1 diff)
• src-client/AudioDriver.cpp (modified) (11 diffs)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (1 diff)
• src-client/DrvAudioVRDE.cpp (modified) (1 diff)
• src-client/DrvAudioVideoRec.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/AudioDriver.h

@@ -31 +31 @@
 struct AudioDriverCfg
 {
-    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, Utf8Str a_strName = "")
+    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, unsigned a_uLUN = 0, Utf8Str a_strName = "")
         : strDev(a_strDev)
         , uInst(a_uInst)
+        , uLUN(a_uLUN)
         , strName(a_strName) { }
 
@@ -40 +41 @@
         this->strDev  = that.strDev;
         this->uInst   = that.uInst;
+        this->uLUN    = that.uLUN;
         this->strName = that.strName;
 
@@ -49 +51 @@
     /** The device instance. */
     unsigned             uInst;
+    /** The LUN the driver is attached to.
+     *  Set the UINT8_MAX if not attached. */
+    unsigned             uLUN;
     /** The driver name. */
     Utf8Str              strName;
@@ -86 +91 @@
     /**
      * Optional (virtual) function to give the derived audio driver
-     * class the ability to add more driver configuration entries when
-     * setting up.
+     * class the ability to add (or change) the driver configuration
+     * entries when setting up.
      *
-     * @param pLunCfg           CFGM configuration node of the driver.
+     * @return VBox status code.
+     * @param  pLunCfg          CFGM configuration node of the driver.
      */
-    virtual void configureDriver(PCFGMNODE pLunCfg) { RT_NOREF(pLunCfg); }
-
-    unsigned getFreeLUN(void);
+    virtual int configureDriver(PCFGMNODE pLunCfg) { RT_NOREF(pLunCfg); return VINF_SUCCESS; }
 
 protected:
@@ -103 +107 @@
     /** Whether the driver is attached or not. */
     bool                 mfAttached;
-    /** The LUN the driver is attached to.
-     *  Set the UINT8_MAX if not attached. */
-    unsigned             muLUN;
 };
 

trunk/src/VBox/Main/include/DrvAudioVRDE.h

@@ -62 +62 @@
 private:
 
-    void configureDriver(PCFGMNODE pLunCfg);
+    int configureDriver(PCFGMNODE pLunCfg);
 
     /** Pointer to the associated VRDE audio driver. */

trunk/src/VBox/Main/include/DrvAudioVideoRec.h

@@ -50 +50 @@
 private:
 
-    void configureDriver(PCFGMNODE pLunCfg);
+    int configureDriver(PCFGMNODE pLunCfg);
 
     /** Pointer to the associated video recording audio driver. */

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

@@ -35 +35 @@
     : mpConsole(pConsole)
     , mfAttached(false)
-    , muLUN(UINT8_MAX)
 {
 }
@@ -43 +42 @@
 }
 
-/**
- * Returns the next free LUN of the audio device driver
- * chain.
- *
- * @return unsigned             Next free LUN in audio device driver chain.
- */
-unsigned AudioDriver::getFreeLUN(void)
-{
-    Console::SafeVMPtrQuiet ptrVM(mpConsole);
-    Assert(ptrVM.isOk());
-
-    PUVM pUVM = ptrVM.rawUVM();
-    AssertPtr(pUVM);
-
-    unsigned uLUN = 0;
-
-    PCFGMNODE pDevLUN;
-    for (;;)
-    {
-        pDevLUN = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "Devices/%s/%u/LUN#%u/", mCfg.strDev.c_str(), mCfg.uInst, uLUN);
-        if (!pDevLUN)
-            break;
-        uLUN++;
-    }
-
-    return uLUN;
-}
-
 
 /**
  * Initializes the audio driver with a certain (device) configuration.
- *
- * @note The driver's LUN will be determined on runtime when attaching the
- *       driver to the audio driver chain.
  *
  * @returns VBox status code.
@@ -84 +52 @@
 {
     AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
+
+    /* Sanity. */
+    AssertReturn(pCfg->strDev.isNotEmpty(),  VERR_INVALID_PARAMETER);
+    AssertReturn(pCfg->uLUN != UINT8_MAX,    VERR_INVALID_PARAMETER);
+    AssertReturn(pCfg->strName.isNotEmpty(), VERR_INVALID_PARAMETER);
 
     /* Apply configuration. */
@@ -142 +115 @@
     Assert(ptrVM.isOk());
 
-
     if (pThis->mfAttached) /* Already attached? Bail out. */
     {
@@ -151 +123 @@
     AudioDriverCfg *pCfg = &pThis->mCfg;
 
-    unsigned uLUN = pThis->muLUN;
-    if (uLUN == UINT8_MAX) /* No LUN assigned / configured yet? Retrieve it. */
-        uLUN = pThis->getFreeLUN();
-
     LogFunc(("strName=%s, strDevice=%s, uInst=%u, uLUN=%u\n",
-             pCfg->strName.c_str(), pCfg->strDev.c_str(), pCfg->uInst, uLUN));
-
-    int vrc = pThis->configure(uLUN, true /* Attach */);
-    if (RT_SUCCESS(vrc))
-        vrc = PDMR3DeviceAttach(ptrVM.rawUVM(), pCfg->strDev.c_str(), pCfg->uInst, uLUN, 0 /* fFlags */,
-                                NULL /* ppBase */);
-    if (RT_SUCCESS(vrc))
-    {
-        pThis->muLUN      = uLUN;
+             pCfg->strName.c_str(), pCfg->strDev.c_str(), pCfg->uInst, pCfg->uLUN));
+
+    int rc = pThis->configure(pCfg->uLUN, true /* Attach */);
+    if (RT_SUCCESS(rc))
+        rc = PDMR3DriverAttach(ptrVM.rawUVM(), pCfg->strDev.c_str(), pCfg->uInst, pCfg->uLUN, 0 /* fFlags */,
+                               NULL /* ppBase */);
+    if (RT_SUCCESS(rc))
+    {
         pThis->mfAttached = true;
-
-        LogRel2(("%s: Driver attached (LUN #%u)\n", pCfg->strName.c_str(), pThis->muLUN));
+        LogRel2(("%s: Driver attached (LUN #%u)\n", pCfg->strName.c_str(), pCfg->uLUN));
     }
     else
-        LogRel(("%s: Failed to attach audio driver, rc=%Rrc\n", pCfg->strName.c_str(), vrc));
-
-    return vrc;
+        LogRel(("%s: Failed to attach audio driver, rc=%Rrc\n", pCfg->strName.c_str(), rc));
+
+    LogFunc(("Returning %Rrc\n", rc));
+    return rc;
 }
 
@@ -232 +199 @@
     Assert(ptrVM.isOk());
 
-    Assert(pThis->muLUN != UINT8_MAX);
-
     AudioDriverCfg *pCfg = &pThis->mCfg;
 
+    Assert(pCfg->uLUN != UINT8_MAX);
+
     LogFunc(("strName=%s, strDevice=%s, uInst=%u, uLUN=%u\n",
-             pCfg->strName.c_str(), pCfg->strDev.c_str(), pCfg->uInst, pThis->muLUN));
-
-    int vrc = PDMR3DriverDetach(ptrVM.rawUVM(), pCfg->strDev.c_str(), pCfg->uInst, pThis->muLUN, "AUDIO",
-                            0 /* iOccurrence */, 0 /* fFlags */);
-    if (RT_SUCCESS(vrc))
-        vrc = pThis->configure(pThis->muLUN, false /* Detach */);
-
-    if (RT_SUCCESS(vrc))
-    {
-        pThis->muLUN      = UINT8_MAX;
+             pCfg->strName.c_str(), pCfg->strDev.c_str(), pCfg->uInst, pCfg->uLUN));
+
+    int rc = PDMR3DeviceDetach(ptrVM.rawUVM(), pCfg->strDev.c_str(), pCfg->uInst, pCfg->uLUN, 0 /* fFlags */);
+    if (RT_SUCCESS(rc))
+        rc = pThis->configure(pCfg->uLUN, false /* Detach */);
+
+    if (RT_SUCCESS(rc))
+    {
         pThis->mfAttached = false;
-
         LogRel2(("%s: Driver detached\n", pCfg->strName.c_str()));
     }
     else
-        LogRel(("%s: Failed to detach audio driver, rc=%Rrc\n", pCfg->strName.c_str(), vrc));
-
-    return vrc;
+        LogRel(("%s: Failed to detach audio driver, rc=%Rrc\n", pCfg->strName.c_str(), rc));
+
+    LogFunc(("Returning %Rrc\n", rc));
+    return rc;
 }
 
@@ -268 +233 @@
 int AudioDriver::configure(unsigned uLUN, bool fAttach)
 {
-    int rc = VINF_SUCCESS;
-
     Console::SafeVMPtrQuiet ptrVM(mpConsole);
     Assert(ptrVM.isOk());
@@ -276 +239 @@
     AssertPtr(pUVM);
 
-    PCFGMNODE pRoot   = CFGMR3GetRootU(pUVM);
+    PCFGMNODE pRoot = CFGMR3GetRootU(pUVM);
     AssertPtr(pRoot);
-    PCFGMNODE pDev0   = CFGMR3GetChildF(pRoot, "Devices/%s/%u/", mCfg.strDev.c_str(), mCfg.uInst);
+    PCFGMNODE pDev0 = CFGMR3GetChildF(pRoot, "Devices/%s/%u/", mCfg.strDev.c_str(), mCfg.uInst);
 
     if (!pDev0) /* No audio device configured? Bail out. */
@@ -286 +249 @@
     }
 
+    int rc = VINF_SUCCESS;
+
     PCFGMNODE pDevLun = CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN);
 
     if (fAttach)
     {
-        AssertMsg(uLUN != UINT8_MAX, ("%s: LUN is undefined when it must not\n", mCfg.strName.c_str()));
-
-        if (!pDevLun)
+        do
         {
-            LogRel2(("%s: Configuring audio driver (to LUN #%RU8)\n", mCfg.strName.c_str(), uLUN));
-
-            PCFGMNODE pLunL0;
-            CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%RU8", uLUN);
-            CFGMR3InsertString(pLunL0, "Driver", "AUDIO");
-
-            PCFGMNODE pLunCfg;
-            CFGMR3InsertNode(pLunL0,   "Config", &pLunCfg);
-                CFGMR3InsertStringF(pLunCfg, "DriverName",    "%s", mCfg.strName.c_str());
-                CFGMR3InsertInteger(pLunCfg, "InputEnabled",  0); /* Play safe by default. */
-                CFGMR3InsertInteger(pLunCfg, "OutputEnabled", 1);
-
-            PCFGMNODE pLunL1;
-            CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1);
-                CFGMR3InsertStringF(pLunL1, "Driver", "%s", mCfg.strName.c_str());
-
-                CFGMR3InsertNode(pLunL1, "Config", &pLunCfg);
+            AssertMsgBreakStmt(pDevLun, ("%s: Device LUN #%u not found\n", mCfg.strName.c_str(), uLUN), rc = VERR_NOT_FOUND);
+
+            LogRel2(("%s: Configuring audio driver (to LUN #%u)\n", mCfg.strName.c_str(), uLUN));
+
+            PCFGMNODE pLunCfg = CFGMR3GetChild(pDevLun, "Config");
+            AssertBreakStmt(pLunCfg, rc = VERR_NOT_FOUND);
+
+                rc = CFGMR3InsertStringF(pLunCfg, "DriverName",    "%s", mCfg.strName.c_str());    AssertRCBreak(rc);
+
+                rc = CFGMR3InsertInteger(pLunCfg, "InputEnabled",  0); /* Play safe by default. */ AssertRCBreak(rc);
+                rc = CFGMR3InsertInteger(pLunCfg, "OutputEnabled", 1);                             AssertRCBreak(rc);
+
+            PCFGMNODE pAttachedDriver, pAttachedDriverCfg;
+            rc = CFGMR3InsertNode(pDevLun, "AttachedDriver", &pAttachedDriver);                    AssertRCBreak(rc);
+                rc = CFGMR3InsertStringF(pAttachedDriver, "Driver", "%s", mCfg.strName.c_str());   AssertRCBreak(rc);
+                rc = CFGMR3InsertNode(pAttachedDriver, "Config", &pAttachedDriverCfg);             AssertRCBreak(rc);
 
                 /* Call the (virtual) method for driver-specific configuration. */
-                configureDriver(pLunCfg);
-        }
-        else
-            rc = VERR_ALREADY_EXISTS;
+                rc = configureDriver(pAttachedDriverCfg);                                          AssertRCBreak(rc);
+
+        } while (0);
     }
     else /* Detach */
@@ -323 +284 @@
         {
             LogRel2(("%s: Unconfiguring audio driver\n", mCfg.strName.c_str()));
-            CFGMR3RemoveNode(pDevLun);
+
+            PCFGMNODE pLunCfg = CFGMR3GetChild(pDevLun, "Config");
+            if (pLunCfg)
+                CFGMR3RemoveNode(pLunCfg);
+
+            rc = CFGMR3InsertNode(pDevLun, "Config", &pLunCfg);
+
+            PCFGMNODE pLunAttachedDriver = CFGMR3GetChild(pDevLun, "AttachedDriver");
+            if (pLunAttachedDriver)
+                CFGMR3RemoveNode(pLunAttachedDriver);
         }
-        else
-            rc = VERR_NOT_FOUND;
-    }
-
-#ifdef DEBUG_andy
-    CFGMR3Dump(pDev0);
-#endif
+    }
 
     if (RT_FAILURE(rc))
@@ -337 +301 @@
                 mCfg.strName.c_str(), fAttach ? "Configuring" : "Unconfiguring", rc));
 
+    LogFunc(("Returning %Rrc\n", rc));
     return rc;
 }

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

@@ -9840 +9840 @@
             AssertComRCReturnVoid(rc);
 
-            if (fVRDEEnabled)
+            if (   fVRDEEnabled
+                && pConsole->mAudioVRDE)
                 pConsole->mAudioVRDE->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
         }
@@ -9848 +9849 @@
         pConsole->i_consoleVRDPServer()->EnableConnections();
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
         Display *pDisplay = pConsole->i_getDisplay();
         AssertPtr(pDisplay);
@@ -9855 +9855 @@
             pDisplay->i_videoRecInvalidate();
 
+            /* If video recording fails for whatever reason here, this is
+             * non-critical and should not be returned at this point -- otherwise
+             * the display driver construction fails completely. */
+            int vrc2 = VINF_SUCCESS;
+
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
             /* Attach the video recording audio driver if required. */
-            if (pDisplay->i_videoRecGetEnabled() & VIDEORECFEATURE_AUDIO)
-                pConsole->mAudioVideoRec->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
-        }
+            if (   pDisplay->i_videoRecGetEnabled() & VIDEORECFEATURE_AUDIO
+                && pConsole->mAudioVideoRec)
+                vrc2 = pConsole->mAudioVideoRec->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
 #endif
+            if (   RT_SUCCESS(vrc2)
+                && pDisplay->i_videoRecGetEnabled()) /* Any video recording (audio and/or video) feature enabled? */
+            {
+                vrc2 = pDisplay->i_videoRecStart();
+                if (RT_SUCCESS(vrc2))
+                    fireVideoCaptureChangedEvent(pConsole->i_getEventSource());
+            }
+        }
+
         if (RT_SUCCESS(vrc))
         {

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

@@ -2979 +2979 @@
 
 #ifdef VBOX_WITH_AUDIO_VRDE
-            AudioDriverCfg DrvCfgVRDE(strAudioDevice, 0 /* Instance */, "AudioVRDE");
+            /* Insert dummy audio driver to have the LUN configured. */
+            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN);
+                InsertConfigString(pLunL0, "Driver", "AUDIO");
+            AudioDriverCfg DrvCfgVRDE(strAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVRDE");
             rc = mAudioVRDE->InitializeConfig(&DrvCfgVRDE);
-            AssertRC(rc);
+            if (RT_SUCCESS(rc))
+                uAudioLUN++;
 #endif /* VBOX_WITH_AUDIO_VRDE */
 
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
-            AudioDriverCfg DrvCfgVideoRec(strAudioDevice, 0 /* Instance */, "AudioVideoRec");
+            /* Insert dummy audio driver to have the LUN configured. */
+            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN);
+                InsertConfigString(pLunL0, "Driver", "AUDIO");
+            AudioDriverCfg DrvCfgVideoRec(strAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVideoRec");
             rc = mAudioVideoRec->InitializeConfig(&DrvCfgVideoRec);
-            AssertRC(rc);
+            if (RT_SUCCESS(rc))
+                uAudioLUN++;
 #endif /* VBOX_WITH_AUDIO_VIDEOREC */
 

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

@@ -4569 +4569 @@
 #endif
 
-#ifdef VBOX_WITH_VIDEOREC
-    if (pDisplay->i_videoRecGetEnabled())
-    {
-        int rc2 = pDisplay->i_videoRecStart();
-        if (RT_SUCCESS(rc2))
-            fireVideoCaptureChangedEvent(pDisplay->mParent->i_getEventSource());
-
-        /* If video recording fails for whatever reason here, this is
-         * non-critical and should not be returned at this point -- otherwise
-         * the display driver construction fails completely. */
-    }
-#endif
-
     return rc;
 }

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

@@ -586 +586 @@
 
 
-void AudioVRDE::configureDriver(PCFGMNODE pLunCfg)
+/**
+ * @copydoc AudioDriver::configureDriver
+ */
+int AudioVRDE::configureDriver(PCFGMNODE pLunCfg)
 {
     CFGMR3InsertInteger(pLunCfg, "Object", (uintptr_t)this);
     CFGMR3InsertInteger(pLunCfg, "ObjectVRDPServer", (uintptr_t)mpConsole->i_consoleVRDPServer());
-}
+
+    return VINF_SUCCESS;
+}
+
 
 int AudioVRDE::onVRDEControl(bool fEnable, uint32_t uFlags)

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

@@ -1032 +1032 @@
 
 
-void AudioVideoRec::configureDriver(PCFGMNODE pLunCfg)
+/**
+ * @copydoc AudioDriver::configureDriver
+ */
+int AudioVideoRec::configureDriver(PCFGMNODE pLunCfg)
 {
     CFGMR3InsertInteger(pLunCfg, "Object",        (uintptr_t)mpConsole->i_getAudioVideoRec());
     CFGMR3InsertInteger(pLunCfg, "ObjectConsole", (uintptr_t)mpConsole);
+
+    return VINF_SUCCESS;
 }