Changeset 49120 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 15, 2013 3:12:06 PM (11 years ago)

Author:

vboxsync

Message:

Main: emulated webcam updates.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (4 diffs)
• include/ConsoleVRDPServer.h (modified) (3 diffs)
• include/EmulatedUSBImpl.h (modified) (1 diff)
• include/UsbWebcamInterface.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (6 diffs)
• src-client/EmulatedUSBImpl.cpp (modified) (12 diffs)
• src-client/UsbWebcamInterface.cpp (modified) (14 diffs)

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

@@ -36 +36 @@
 class AudioSniffer;
 class Nvram;
-class EmWebcam;
 #ifdef VBOX_WITH_USB_CARDREADER
 class UsbCardReader;
@@ -243 +242 @@
     UsbCardReader *getUsbCardReader() { return mUsbCardReader; }
 #endif
-    EmWebcam *getEmWebcam() { return mEmWebcam; }
 
     int VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);
@@ -306 +304 @@
     VMMDevMouseInterface *getVMMDevMouseInterface();
     DisplayMouseInterface *getDisplayMouseInterface();
+
+    EmulatedUSB *getEmulatedUSB(void) { return mEmulatedUSB; }
 
 private:
@@ -825 +825 @@
     AudioSniffer * const mAudioSniffer;
     Nvram   * const mNvram;
-    EmWebcam * const mEmWebcam;
 #ifdef VBOX_WITH_USB_CARDREADER
     UsbCardReader * const mUsbCardReader;

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

@@ -40 +40 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+class EmWebcam;
+
 typedef struct _VRDPInputSynch
 {
@@ -152 +154 @@
     int VideoInControl(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle,
                        const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq);
+
+    Console *getConsole(void) { return mConsole; }
 
 private:
@@ -339 +343 @@
                                                        const VRDEVIDEOINPAYLOADHDR *pFrame,
                                                        uint32_t cbFrame);
+    EmWebcam *mEmWebcam;
 
     /* Input interface. */

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

@@ -46 +46 @@
                                           const void *pvData, uint32_t cbData);
 
+    HRESULT webcamAttachInternal(const com::Utf8Str &aPath,
+                                 const com::Utf8Str &aSettings,
+                                 const char *pszDriver,
+                                 void *pvObject);
+    HRESULT webcamDetachInternal(const com::Utf8Str &aPath);
+
 private:
 

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

@@ -23 +23 @@
 #include <VBox/RemoteDesktop/VRDEVideoIn.h>
 
-class Console;
+class ConsoleVRDPServer;
 typedef struct EMWEBCAMDRV EMWEBCAMDRV;
 typedef struct EMWEBCAMREMOTE EMWEBCAMREMOTE;
@@ -30 +30 @@
 {
     public:
-        EmWebcam(Console *console);
+        EmWebcam(ConsoleVRDPServer *pServer);
         virtual ~EmWebcam();
 
@@ -56 +56 @@
         static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
 
-        Console * const mParent;
+        ConsoleVRDPServer * const mParent;
 
         EMWEBCAMDRV *mpDrv;

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

@@ -58 +58 @@
 #include "AudioSnifferInterface.h"
 #include "Nvram.h"
-#include "UsbWebcamInterface.h"
 #ifdef VBOX_WITH_USB_CARDREADER
 # include "UsbCardReader.h"
@@ -386 +385 @@
     , mAudioSniffer(NULL)
     , mNvram(NULL)
-    , mEmWebcam(NULL)
 #ifdef VBOX_WITH_USB_CARDREADER
     , mUsbCardReader(NULL)
@@ -559 +557 @@
         }
 
-        unconst(mEmWebcam) = new EmWebcam(this);
-        AssertReturn(mEmWebcam, E_FAIL);
 #ifdef VBOX_WITH_USB_CARDREADER
         unconst(mUsbCardReader) = new UsbCardReader(this);
@@ -656 +652 @@
         delete mNvram;
         unconst(mNvram) = NULL;
-    }
-
-    if (mEmWebcam)
-    {
-        delete mEmWebcam;
-        unconst(mEmWebcam) = NULL;
     }
 

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

@@ -1407 +1407 @@
     rc = RTCritSectInit(&mTSMFLock);
     AssertRC(rc);
+
+    mEmWebcam = new EmWebcam(this);
+    AssertPtr(mEmWebcam);
 }
 
@@ -1429 +1432 @@
             maFramebuffers[i] = NULL;
         }
+    }
+
+    if (mEmWebcam)
+    {
+        delete mEmWebcam;
+        mEmWebcam = NULL;
     }
 
@@ -2647 +2656 @@
 {
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
-    pWebcam->EmWebcamCbNotify(u32Id, pvData, cbData);
+    if (pThis->mEmWebcam)
+    {
+        pThis->mEmWebcam->EmWebcamCbNotify(u32Id, pvData, cbData);
+    }
 }
 
@@ -2659 +2670 @@
 {
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
-    pWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
+    if (pThis->mEmWebcam)
+    {
+        pThis->mEmWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
+    }
 }
 
@@ -2671 +2684 @@
 {
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
-    pWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
+    if (pThis->mEmWebcam)
+    {
+        pThis->mEmWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
+    }
 }
 
@@ -2682 +2697 @@
 {
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
-    pWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame);
+    if (pThis->mEmWebcam)
+    {
+        pThis->mEmWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame);
+    }
 }
 

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

@@ -54 +54 @@
         EUSBSettingsMap mDrvSettings;
 
-        static DECLCALLBACK(int) emulatedWebcamAttach(PUVM pUVM, EUSBWEBCAM *pThis);
+        void *mpvObject;
+
+        static DECLCALLBACK(int) emulatedWebcamAttach(PUVM pUVM, EUSBWEBCAM *pThis, const char *pszDriver);
         static DECLCALLBACK(int) emulatedWebcamDetach(PUVM pUVM, EUSBWEBCAM *pThis);
 
@@ -68 +70 @@
             mcRefs(1),
             mpEmulatedUSB(NULL),
-            enmStatus(EUSBDEVICE_CREATED)
+            enmStatus(EUSBDEVICE_CREATED),
+            mpvObject(NULL)
         {
             RT_ZERO(mUuid);
@@ -91 +94 @@
                            EmulatedUSB *pEmulatedUSB,
                            const com::Utf8Str *aPath,
-                           const com::Utf8Str *aSettings);
+                           const com::Utf8Str *aSettings,
+                           void *pvObject);
         HRESULT Attach(Console *pConsole,
-                       PUVM pUVM);
+                       PUVM pUVM,
+                       const char *pszDriver);
         HRESULT Detach(Console *pConsole,
                        PUVM pUVM);
@@ -103 +108 @@
 
 
-/* static */ DECLCALLBACK(int) EUSBWEBCAM::emulatedWebcamAttach(PUVM pUVM, EUSBWEBCAM *pThis)
+/* static */ DECLCALLBACK(int) EUSBWEBCAM::emulatedWebcamAttach(PUVM pUVM, EUSBWEBCAM *pThis, const char *pszDriver)
 {
     EUSBSettingsMap::const_iterator it;
@@ -120 +125 @@
     PCFGMNODE pLunL0;
     CFGMR3InsertNode(pInstance,   "LUN#0", &pLunL0);
-    CFGMR3InsertString(pLunL0,      "Driver", "HostWebcam");
+    CFGMR3InsertString(pLunL0,      "Driver", pszDriver);
     CFGMR3InsertNode(pLunL0,        "Config", &pConfig);
     CFGMR3InsertString(pConfig,       "DevicePath", pThis->mPath.c_str());
+    CFGMR3InsertInteger(pConfig,      "Object", (uintptr_t)pThis->mpvObject);
     for (it = pThis->mDrvSettings.begin(); it != pThis->mDrvSettings.end(); ++it)
         CFGMR3InsertString(pConfig, it->first.c_str(), it->second.c_str());
@@ -140 +146 @@
                                EmulatedUSB *pEmulatedUSB,
                                const com::Utf8Str *aPath,
-                               const com::Utf8Str *aSettings)
+                               const com::Utf8Str *aSettings,
+                               void *pvObject)
 {
     HRESULT hrc = S_OK;
@@ -161 +168 @@
             {
                 mpEmulatedUSB = pEmulatedUSB;
+                mpvObject = pvObject;
             }
         }
@@ -183 +191 @@
 
 HRESULT EUSBWEBCAM::Attach(Console *pConsole,
-                           PUVM pUVM)
+                           PUVM pUVM,
+                           const char *pszDriver)
 {
     HRESULT hrc = S_OK;
 
     int  vrc = VMR3ReqCallWaitU(pUVM, 0 /* idDstCpu (saved state, see #6232) */,
-                                (PFNRT)emulatedWebcamAttach, 2,
-                                pUVM, this);
+                                (PFNRT)emulatedWebcamAttach, 3,
+                                pUVM, this, pszDriver);
 
     if (SUCCEEDED(hrc) && RT_FAILURE(vrc))
@@ -322 +331 @@
                                   const com::Utf8Str &aSettings)
 {
+    return webcamAttachInternal(aPath, aSettings, "HostWebcam", NULL);
+}
+
+HRESULT EmulatedUSB::webcamAttachInternal(const com::Utf8Str &aPath,
+                                          const com::Utf8Str &aSettings,
+                                          const char *pszDriver,
+                                          void *pvObject)
+{
     HRESULT hrc = S_OK;
 
@@ -332 +349 @@
         if (p)
         {
-            hrc = p->Initialize(m.pConsole, this, &path, &aSettings);
+            hrc = p->Initialize(m.pConsole, this, &path, &aSettings, pvObject);
             if (SUCCEEDED(hrc))
             {
@@ -362 +379 @@
             if (SUCCEEDED(hrc))
             {
-                hrc = p->Attach(m.pConsole, ptrVM.rawUVM());
+                hrc = p->Attach(m.pConsole, ptrVM.rawUVM(), pszDriver);
             }
 
@@ -395 +412 @@
 
 HRESULT EmulatedUSB::webcamDetach(const com::Utf8Str &aPath)
+{
+    return webcamDetachInternal(aPath);
+}
+
+HRESULT EmulatedUSB::webcamDetachInternal(const com::Utf8Str &aPath)
 {
     HRESULT hrc = S_OK;

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

@@ -21 +21 @@
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
+#include "EmulatedUSBImpl.h"
 
 #include <VBox/vmm/pdmwebcaminfs.h>
 
 
+typedef struct EMWEBCAMREMOTE
+{
+    EmWebcam *pEmWebcam;
+
+    VRDEVIDEOINDEVICEHANDLE deviceHandle; /* The remote identifier. */
+
+    /* Received from the remote client. */
+    uint32_t u32Version;                  /* VRDE_VIDEOIN_NEGOTIATE_VERSION */
+    uint32_t fu32Capabilities;            /* VRDE_VIDEOIN_NEGOTIATE_CAP_* */
+    VRDEVIDEOINDEVICEDESC *pDeviceDesc;
+    uint32_t cbDeviceDesc;
+
+    /* The device identifier for the PDM device.*/
+    uint64_t u64DeviceId;
+} EMWEBCAMREMOTE;
+
 typedef struct EMWEBCAMDRV
 {
-    EmWebcam *pEmWebcam;
+    EMWEBCAMREMOTE *pRemote;
     PPDMIWEBCAMUP  pIWebcamUp;
     PDMIWEBCAMDOWN IWebcamDown;
 } EMWEBCAMDRV, *PEMWEBCAMDRV;
 
-typedef struct EMWEBCAMREMOTE
-{
-    EmWebcam *pEmWebcam;
-
-    VRDEVIDEOINDEVICEHANDLE deviceHandle; /* The remote identifier. */
-    uint32_t u32Version;                  /* VRDE_VIDEOIN_NEGOTIATE_VERSION */
-    uint32_t fu32Capabilities;            /* VRDE_VIDEOIN_NEGOTIATE_CAP_* */
-
-    /* The device identifier for the PDM device.*/
-    uint64_t u64DeviceId;
-} EMWEBCAMREMOTE;
-
 typedef struct EMWEBCAMREQCTX
 {
@@ -54 +59 @@
                                            bool fReady)
 {
+    NOREF(fReady);
+
     PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown);
-    NOREF(pThis);
-    NOREF(fReady);
+    EMWEBCAMREMOTE *pRemote = pThis->pRemote;
+
+    LogFlowFunc(("pRemote:%p\n", pThis->pRemote));
+
+    if (pThis->pIWebcamUp)
+    {
+        pThis->pIWebcamUp->pfnWebcamUpAttached(pThis->pIWebcamUp,
+                                               pRemote->u64DeviceId,
+                                               (const PDMIWEBCAM_DEVICEDESC *)pRemote->pDeviceDesc,
+                                               pRemote->cbDeviceDesc,
+                                               pRemote->u32Version,
+                                               pRemote->fu32Capabilities);
+    }
 }
 
@@ -66 +84 @@
 {
     PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown);
-
-    LogFlowFunc(("pEmWebcam:%p, u64DeviceId %lld\n", pThis->pEmWebcam, u64DeviceId));
-
-    return pThis->pEmWebcam->SendControl(pThis, pvUser, u64DeviceId, (const VRDEVIDEOINCTRLHDR *)pCtrl, cbCtrl);
-}
-
-
-EmWebcam::EmWebcam(Console *console)
+    EMWEBCAMREMOTE *pRemote = pThis->pRemote;
+
+    LogFlowFunc(("pRemote:%p, u64DeviceId %lld\n", pRemote, u64DeviceId));
+
+    return pRemote->pEmWebcam->SendControl(pThis, pvUser, u64DeviceId, (const VRDEVIDEOINCTRLHDR *)pCtrl, cbCtrl);
+}
+
+
+EmWebcam::EmWebcam(ConsoleVRDPServer *pServer)
     :
-    mParent(console),
+    mParent(pServer),
     mpDrv(NULL),
     mpRemote(NULL),
@@ -86 +105 @@
     if (mpDrv)
     {
-        mpDrv->pEmWebcam = NULL;
+        mpDrv->pRemote = NULL;
         mpDrv = NULL;
     }
@@ -104 +123 @@
     if (mpRemote)
     {
-        mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle);
+        mParent->VideoInDeviceDetach(&mpRemote->deviceHandle);
+
+        RTMemFree(mpRemote->pDeviceDesc);
+        mpRemote->pDeviceDesc = NULL;
+        mpRemote->cbDeviceDesc = 0;
+
         RTMemFree(mpRemote);
         mpRemote = NULL;
     }
 
+    mpDrv->pRemote = NULL;
     mpDrv = NULL;
 }
@@ -159 +184 @@
             pRemote->u32Version       = u32Version;
             pRemote->fu32Capabilities = fu32Capabilities;
+            pRemote->pDeviceDesc      = NULL;
+            pRemote->cbDeviceDesc     = 0;
             pRemote->u64DeviceId      = ASMAtomicIncU64(&mu64DeviceIdSrc);
 
@@ -164 +191 @@
 
             /* Tell the server that this webcam will be used. */
-            rc = mParent->consoleVRDPServer()->VideoInDeviceAttach(&mpRemote->deviceHandle, mpRemote);
+            rc = mParent->VideoInDeviceAttach(&mpRemote->deviceHandle, mpRemote);
             if (RT_FAILURE(rc))
             {
@@ -173 +200 @@
 
             /* Get the device description. */
-            rc = mParent->consoleVRDPServer()->VideoInGetDeviceDesc(NULL, &mpRemote->deviceHandle);
+            rc = mParent->VideoInGetDeviceDesc(NULL, &mpRemote->deviceHandle);
 
             if (RT_FAILURE(rc))
             {
-                mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle);
+                mParent->VideoInDeviceDetach(&mpRemote->deviceHandle);
                 RTMemFree(mpRemote);
                 mpRemote = NULL;
@@ -201 +228 @@
                                                            mpRemote->u64DeviceId);
                 }
-
-                /* No need to tell the server by calling VideoInDeviceDetach because the server is telling. */
-                RTMemFree(mpRemote);
-                mpRemote = NULL;
+                /* mpRemote is deallocated in EmWebcamDestruct */
             }
         } break;
@@ -228 +252 @@
     if (RT_SUCCESS(rcRequest))
     {
-        if (mpDrv && mpDrv->pIWebcamUp)
-        {
-            mpDrv->pIWebcamUp->pfnWebcamUpAttached(mpDrv->pIWebcamUp,
-                                                   pRemote->u64DeviceId,
-                                                   (const PDMIWEBCAM_DEVICEDESC *)pDeviceDesc,
-                                                   cbDeviceDesc,
-                                                   pRemote->u32Version,
-                                                   pRemote->fu32Capabilities);
-        }
+        /* Save device description. */
+        Assert(pRemote->pDeviceDesc == NULL);
+        pRemote->pDeviceDesc = (VRDEVIDEOINDEVICEDESC *)RTMemDup(pDeviceDesc, cbDeviceDesc);
+        pRemote->cbDeviceDesc = cbDeviceDesc;
+
+        /* Try to attach the device. */
+        EmulatedUSB *pEUSB = mParent->getConsole()->getEmulatedUSB();
+        pEUSB->webcamAttachInternal("", "", "EmWebcam", pRemote);
     }
     else
     {
-        mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle);
+        mParent->VideoInDeviceDetach(&mpRemote->deviceHandle);
         RTMemFree(mpRemote);
         mpRemote = NULL;
@@ -324 +347 @@
         pCtx->pvUser = pvUser;
 
-        rc = mParent->consoleVRDPServer()->VideoInControl(pCtx, &mpRemote->deviceHandle, pControl, cbControl);
+        rc = mParent->VideoInControl(pCtx, &mpRemote->deviceHandle, pControl, cbControl);
 
         if (RT_FAILURE(rc))
@@ -351 +374 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
     PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV);
-
-    LogFlowFunc(("iInstance %d, pEmWebcam %p, pIWebcamUp %p\n",
-                 pDrvIns->iInstance, pThis->pEmWebcam, pThis->pIWebcamUp));
-
-    if (pThis->pEmWebcam)
-    {
-        pThis->pEmWebcam->EmWebcamDestruct(pThis);
-        pThis->pEmWebcam = NULL;
+    EMWEBCAMREMOTE *pRemote = pThis->pRemote;
+
+    LogFlowFunc(("iInstance %d, pRemote %p, pIWebcamUp %p\n",
+                 pDrvIns->iInstance, pRemote, pThis->pIWebcamUp));
+
+    if (pRemote && pRemote->pEmWebcam)
+    {
+        pRemote->pEmWebcam->EmWebcamDestruct(pThis);
     }
 }
@@ -368 +391 @@
 
     PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV);
-
-    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -392 +412 @@
 
     /* Everything ok. Initialize. */
-    pThis->pEmWebcam = (EmWebcam *)pv;
-    pThis->pEmWebcam->EmWebcamConstruct(pThis);
+    pThis->pRemote = (EMWEBCAMREMOTE *)pv;
+    pThis->pRemote->pEmWebcam->EmWebcamConstruct(pThis);
 
     pDrvIns->IBase.pfnQueryInterface = drvQueryInterface;