Changeset 70035 in vbox

Timestamp:

Dec 8, 2017 3:50:01 PM (7 years ago)

Author:

vboxsync

Message:

Main/VideoRec: Made the audio driver's LUN assignment more flexible by keeping the initial LUN# around when (re-)attaching the driver.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (6 diffs)
• src-client/DisplayImpl.cpp (modified) (11 diffs)
• src-client/VideoRec.h (modified) (1 diff)

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

@@ -213 +213 @@
     bool                     i_videoRecStarted(void);
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
-    int                      i_videoRecConfigureAudioDriver(const Utf8Str& strAdapter, unsigned uInstance, unsigned uLun, bool fAttach);
+    int                      i_videoRecConfigureAudioDriver(const Utf8Str& strAdapter, unsigned uInstance, unsigned uLUN, bool fAttach);
 # endif
-    static DECLCALLBACK(int) i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach);
+    static DECLCALLBACK(int) i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach, unsigned *puLUN);
     int                      i_videoRecSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs);
     int                      i_videoRecStart(void);

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

@@ -5517 +5517 @@
             alock.release();
 
+            const PVIDEORECCFG pCfg = pDisplay->i_videoRecGetConfig();
+            const unsigned     uLUN = pCfg->Audio.uLUN; /* Get the currently configured LUN. */
+
             int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY /*idDstCpu*/,
-                                       (PFNRT)Display::i_videoRecConfigure, 3,
-                                       pDisplay, pDisplay->i_videoRecGetConfig(), true /* fAttachDetach */);
+                                       (PFNRT)Display::i_videoRecConfigure, 4,
+                                       pDisplay, pCfg, true /* fAttachDetach */, &pCfg->Audio.uLUN);
             if (RT_SUCCESS(vrc))
             {
                 /* Make sure to acquire the lock again after we're done running in EMT. */
                 alock.acquire();
+
+                /* We don't support dynamic LUNs for this stuff yet. */
+                Assert(uLUN == pCfg->Audio.uLUN);
 
                 if (!mDisplay->i_videoRecStarted())

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

@@ -2987 +2987 @@
             }
 
-            uint8_t u8AudioLUN = 0;
+            unsigned uAudioLUN = 0;
 
             BOOL fAudioEnabledIn = FALSE;
@@ -2994 +2994 @@
             hrc = audioAdapter->COMGETTER(EnabledOut)(&fAudioEnabledOut);                   H();
 
-            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", u8AudioLUN++);
+            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN++);
             InsertConfigString(pLunL0, "Driver", "AUDIO");
 
@@ -3017 +3017 @@
              * The VRDE audio backend driver.
              */
-            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", u8AudioLUN++);
+            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN++);
             InsertConfigString(pLunL0, "Driver", "AUDIO");
 
@@ -3042 +3042 @@
                 /* Note: Don't do any driver attaching (fAttachDetach) here, as this will
                  *       be done automatically as part of the VM startup process. */
-                rc = pDisplay->i_videoRecConfigure(pDisplay, pDisplay->i_videoRecGetConfig(), false /* fAttachDetach */);
-
-                /** @todo Fix this: Figure out what the next LUN might be. */
-                u8AudioLUN = 3;
+                rc = pDisplay->i_videoRecConfigure(pDisplay, pDisplay->i_videoRecGetConfig(), false /* fAttachDetach */,
+                                                   &uAudioLUN);
+                if (RT_SUCCESS(rc)) /* Successfully configured, use next LUN for drivers below. */
+                    uAudioLUN++;
             }
 #endif /* VBOX_WITH_AUDIO_VIDEOREC */
@@ -3055 +3055 @@
                  * The audio debugging backend.
                  */
-                CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", u8AudioLUN++);
+                CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN++);
                 InsertConfigString(pLunL0, "Driver", "AUDIO");
 
@@ -3093 +3093 @@
              * The ValidationKit backend.
              */
-            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", u8AudioLUN++);
+            CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN++);
             InsertConfigString(pLunL0, "Driver", "AUDIO");
             InsertConfigNode(pLunL0,   "Config", &pCfg);

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

@@ -2424 +2424 @@
  * @param   strDevice           The PDM device name.
  * @param   uInstance           The PDM device instance.
- * @param   uLun                The PDM LUN number of the drive.
+ * @param   uLUN                The PDM LUN number of the driver.
  * @param   fAttach             Whether to attach or detach the driver configuration to CFGM.
  *
@@ -2430 +2430 @@
  */
 int Display::i_videoRecConfigureAudioDriver(const Utf8Str& strDevice,
-                                                unsigned       uInstance,
-                                                unsigned       uLun,
-                                                bool           fAttach)
+                                            unsigned       uInstance,
+                                            unsigned       uLUN,
+                                            bool           fAttach)
 {
     if (strDevice.isEmpty()) /* No audio device configured. Bail out. */
@@ -2453 +2453 @@
     AssertPtr(pDev0);
 
-    PCFGMNODE pDevLun = CFGMR3GetChildF(pDev0, "LUN#%u/", uLun);
+    PCFGMNODE pDevLun = CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN);
 
     if (fAttach)
@@ -2462 +2462 @@
 
             PCFGMNODE pLunL0;
-            CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%RU8", uLun);
+            CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%RU8", uLUN);
             CFGMR3InsertString(pLunL0, "Driver", "AUDIO");
 
@@ -2494 +2494 @@
 
 /**
- * Configures video capturing and attaches / detaches the associated driver(s).
+ * Configures video capturing (via CFGM) and attaches / detaches the associated driver.
+ * Currently this only is the audio driver (if available).
  *
  * @returns IPRT status code.
@@ -2500 +2501 @@
  * @param   pCfg                Where to store the configuration into.
  * @param   fAttachDetach       Whether to attach/detach associated drivers or not.
+ * @param   puLUN               On input, this defines the LUN to which the audio driver shall be assigned to.
+ *                              On output, this returns the LUN the audio driver was assigned to.
  */
 /* static */
-DECLCALLBACK(int) Display::i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach)
+DECLCALLBACK(int) Display::i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach, unsigned *puLUN)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfg,  VERR_INVALID_POINTER);
+    AssertPtrReturn(puLUN, VERR_INVALID_POINTER);
 
     AssertPtr(pThis->mParent);
@@ -2646 +2650 @@
     AssertComRC(rc);
 
+    unsigned uInstance = 0;
+    unsigned uLUN      = *puLUN;
+
     Utf8Str strAudioDev = pThis->mParent->i_getAudioAdapterDeviceName(audioAdapter);
     if (!strAudioDev.isEmpty())
@@ -2651 +2658 @@
         Console::SafeVMPtr ptrVM(pThis->mParent);
         Assert(ptrVM.isOk());
-
-        unsigned uInstance = 0;
-        unsigned uLun      = 2; /** @todo Make this configurable. */
 
         /*
@@ -2664 +2668 @@
         if (pCfg->Audio.fEnabled) /* Enable */
         {
-            vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLun, true /* fAttach */);
+            vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLUN, true /* fAttach */);
             if (   RT_SUCCESS(vrc2)
                 && fAttachDetach)
             {
-                vrc2 = PDMR3DriverAttach(ptrVM.rawUVM(), strAudioDev.c_str(), uInstance, uLun, 0 /* fFlags */, NULL /* ppBase */);
+                vrc2 = PDMR3DriverAttach(ptrVM.rawUVM(), strAudioDev.c_str(), uInstance, uLUN, 0 /* fFlags */, NULL /* ppBase */);
             }
 
@@ -2677 +2681 @@
         {
             if (fAttachDetach)
-                vrc2 = PDMR3DriverDetach(ptrVM.rawUVM(), strAudioDev.c_str(), uInstance, uLun, "AUDIO",
+                vrc2 = PDMR3DriverDetach(ptrVM.rawUVM(), strAudioDev.c_str(), uInstance, uLUN, "AUDIO",
                                          0 /* iOccurance */, 0 /* fFlags */);
 
             if (RT_SUCCESS(vrc2))
             {
-                vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLun, false /* fAttach */);
+                vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLUN, false /* fAttach */);
             }
 
@@ -2710 +2714 @@
 
     }
+
+    if (puLUN)
+        *puLUN = uLUN;
 
     return S_OK;

trunk/src/VBox/Main/src-client/VideoRec.h

@@ -96 +96 @@
         /** Whether audio recording is enabled or not. */
         bool                fEnabled;
+        /** The device LUN the audio driver is attached / configured to. */
+        unsigned            uLUN;
         /** Hertz (Hz) rate. */
         uint16_t            uHz;