Changeset 44758 in vbox for trunk/src/VBox

Timestamp:

Feb 20, 2013 11:45:18 AM (12 years ago)

Author:

vboxsync

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

83867

Message:

include,ExtPacks\Puel\UsbWebcam,Main,VRDP: emulated USB webcam updates.

Location:

trunk/src/VBox/Main

Files:

• include/UsbWebcamInterface.h (modified) (2 diffs)
• src-client/UsbWebcamInterface.cpp (modified) (16 diffs)

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

@@ -34 +34 @@
 
         static const PDMDRVREG DrvReg;
-        EMWEBCAMDRV *mpDrv;
 
+        void EmWebcamConstruct(EMWEBCAMDRV *pDrv);
         void EmWebcamDestruct(EMWEBCAMDRV *pDrv);
 
@@ -58 +58 @@
         Console * const mParent;
 
+        EMWEBCAMDRV *mpDrv;
         EMWEBCAMREMOTE *mpRemote;
         uint64_t volatile mu64DeviceIdSrc;

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

@@ -25 +25 @@
 
 
-typedef struct EMWEBCAMDRV *PEMWEBCAMDRV;
-
-struct EMWEBCAMDRV
+typedef struct EMWEBCAMDRV
 {
     EmWebcam *pEmWebcam;
+    PPDMIWEBCAMUP  pIWebcamUp;
     PDMIWEBCAMDOWN IWebcamDown;
-    PPDMIWEBCAMUP  pIWebcamUp;
-
-};
-
-struct EMWEBCAMREMOTE
+} EMWEBCAMDRV, *PEMWEBCAMDRV;
+
+typedef struct EMWEBCAMREMOTE
 {
     EmWebcam *pEmWebcam;
 
-    /* The remote identifier. */
-    VRDEVIDEOINDEVICEHANDLE deviceHandle;
+    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
@@ -59 +57 @@
                                             uint32_t cbCtrl)
 {
-    LogFlowFunc(("pInterface:%p\n", pInterface));
-
     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);
@@ -84 +82 @@
 }
 
+void EmWebcam::EmWebcamConstruct(EMWEBCAMDRV *pDrv)
+{
+    AssertReturnVoid(mpDrv == NULL);
+
+    mpDrv = pDrv;
+}
+
 void EmWebcam::EmWebcamDestruct(EMWEBCAMDRV *pDrv)
 {
@@ -94 +99 @@
         mpRemote = NULL;
     }
+
+    mpDrv = NULL;
 }
 
@@ -102 +109 @@
     switch (u32Id)
     {
-        case VRDE_VIDEOIN_NOTIFY_ATTACH:
+        case VRDE_VIDEOIN_NOTIFY_ID_ATTACH:
         {
             VRDEVIDEOINNOTIFYATTACH *p = (VRDEVIDEOINNOTIFYATTACH *)pvData;
-            Assert(cbData == sizeof(VRDEVIDEOINNOTIFYATTACH));
-
-            LogFlowFunc(("ATTACH[%d,%d]\n", p->deviceHandle.u32ClientId, p->deviceHandle.u32DeviceId));
+
+            /* Older versions did not report u32Version and fu32Capabilities. */
+            uint32_t u32Version = 1;
+            uint32_t fu32Capabilities = VRDE_VIDEOIN_NEGOTIATE_CAP_VOID;
+
+            if (cbData >= RT_OFFSETOF(VRDEVIDEOINNOTIFYATTACH, u32Version) + sizeof(p->u32Version))
+            {
+                u32Version = p->u32Version;
+            }
+
+            if (cbData >= RT_OFFSETOF(VRDEVIDEOINNOTIFYATTACH, fu32Capabilities) + sizeof(p->fu32Capabilities))
+            {
+                fu32Capabilities = p->fu32Capabilities;
+            }
+
+            LogFlowFunc(("ATTACH[%d,%d] version %d, caps 0x%08X\n",
+                         p->deviceHandle.u32ClientId, p->deviceHandle.u32DeviceId,
+                         u32Version, fu32Capabilities));
 
             /* Currently only one device is allowed. */
@@ -124 +146 @@
             }
 
-            pRemote->pEmWebcam = this;
-            pRemote->deviceHandle = p->deviceHandle;
-            pRemote->u64DeviceId = ASMAtomicIncU64(&mu64DeviceIdSrc);
+            pRemote->pEmWebcam        = this;
+            pRemote->deviceHandle     = p->deviceHandle;
+            pRemote->u32Version       = u32Version;
+            pRemote->fu32Capabilities = fu32Capabilities;
+            pRemote->u64DeviceId      = ASMAtomicIncU64(&mu64DeviceIdSrc);
 
             mpRemote = pRemote;
@@ -153 +177 @@
         } break;
 
-        case VRDE_VIDEOIN_NOTIFY_DETACH:
+        case VRDE_VIDEOIN_NOTIFY_ID_DETACH:
         {
             VRDEVIDEOINNOTIFYDETACH *p = (VRDEVIDEOINNOTIFYDETACH *)pvData;
@@ -163 +187 @@
             if (mpRemote)
             {
-                if (mpDrv->pIWebcamUp)
+                if (mpDrv && mpDrv->pIWebcamUp)
                 {
                     mpDrv->pIWebcamUp->pfnWebcamUpDetached(mpDrv->pIWebcamUp,
@@ -190 +214 @@
     Assert(pRemote == mpRemote);
 
-    LogFlowFunc(("rcRequest %Rrc %p %p %p %d\n",
-                 rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDeviceDesc));
+    LogFlowFunc(("mpDrv %p, rcRequest %Rrc %p %p %p %d\n",
+                 mpDrv, rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDeviceDesc));
 
     if (RT_SUCCESS(rcRequest))
     {
-        if (mpDrv->pIWebcamUp)
+        if (mpDrv && mpDrv->pIWebcamUp)
         {
             mpDrv->pIWebcamUp->pfnWebcamUpAttached(mpDrv->pIWebcamUp,
                                                    pRemote->u64DeviceId,
                                                    (const PDMIWEBCAM_DEVICEDESC *)pDeviceDesc,
-                                                   cbDeviceDesc);
+                                                   cbDeviceDesc,
+                                                   pRemote->u32Version,
+                                                   pRemote->fu32Capabilities);
         }
     }
@@ -222 +248 @@
     bool fResponse = (pvUser != NULL);
 
-    if (mpDrv->pIWebcamUp)
+    if (mpDrv && mpDrv->pIWebcamUp)
     {
         mpDrv->pIWebcamUp->pfnWebcamUpControl(mpDrv->pIWebcamUp,
@@ -241 +267 @@
                  rcRequest, pDeviceCtx, pFrame, cbFrame));
 
-    if (mpDrv->pIWebcamUp)
+    if (mpDrv && mpDrv->pIWebcamUp)
     {
         mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp,
@@ -293 +319 @@
 /* static */ DECLCALLBACK(void *) EmWebcam::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
-    LogFlowFunc(("pInterface:%p, pszIID:%s\n", __FUNCTION__, pInterface, pszIID));
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
     PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV);
+
+    LogFlowFunc(("pszIID:%s\n", pszIID));
 
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
@@ -304 +331 @@
 /* static */ DECLCALLBACK(int) EmWebcam::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
-    LogFlow(("%s: iInstance/#d, pCfg:%p, fFlags:%x\n", __FUNCTION__, pDrvIns->iInstance, pCfg, fFlags));
+    LogFlowFunc(("iInstance:%d, pCfg:%p, fFlags:%x\n", pDrvIns->iInstance, pCfg, fFlags));
 
     PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV);
@@ -315 +342 @@
                     VERR_PDM_DRVINS_NO_ATTACH);
 
+    /* Check early that there is a device. No need to init anything if there is no device. */
+    pThis->pIWebcamUp = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIWEBCAMUP);
+    if (pThis->pIWebcamUp == NULL)
+    {
+        LogRel(("USBWEBCAM: Emulated webcam device does not exist.\n"));
+        return VERR_PDM_MISSING_INTERFACE;
+    }
+
     void *pv = NULL;
     int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
-    AssertMsgRCReturn(rc, ("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc), rc);
-
+    if (!RT_VALID_PTR(pv))
+         rc = VERR_INVALID_PARAMETER;
+    AssertMsgReturn(RT_SUCCESS(rc),
+                    ("Configuration error: No/bad \"Object\" %p value! rc=%Rrc\n", pv, rc), rc);
+
+    /* Everything ok. Initialize. */
     pThis->pEmWebcam = (EmWebcam *)pv;
-    pThis->pEmWebcam->mpDrv = pThis;
+    pThis->pEmWebcam->EmWebcamConstruct(pThis);
 
     pDrvIns->IBase.pfnQueryInterface = drvQueryInterface;
@@ -326 +365 @@
     pThis->IWebcamDown.pfnWebcamDownControl = drvEmWebcamControl;
 
-    pThis->pIWebcamUp = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIWEBCAMUP);
-
-    AssertReturn(pThis->pIWebcamUp, VERR_PDM_MISSING_INTERFACE);
-
     return VINF_SUCCESS;
 }
@@ -335 +370 @@
 /* static */ DECLCALLBACK(void) EmWebcam::drvDestruct(PPDMDRVINS pDrvIns)
 {
-    LogFlow(("%s: iInstance/#d\n", __FUNCTION__, pDrvIns->iInstance));
     PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV);
+
+    LogFlowFunc(("iInstance %d, pEmWebcam %p, pIWebcamUp %p\n",
+                 pDrvIns->iInstance, pThis->pEmWebcam, pThis->pIWebcamUp));
+
     if (pThis->pEmWebcam)
     {