Changeset 44191 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 20, 2012 5:36:56 PM (12 years ago)

Author:

vboxsync

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

82916

Message:

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

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• ConsoleVRDPServer.cpp (modified) (6 diffs)
• VBoxDriversRegister.cpp (modified) (1 diff)

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

@@ -380 +380 @@
     , mNvram(NULL)
 #ifdef VBOX_WITH_USB_VIDEO
-    , mUsbWebcamInterface(NULL)
+    , mEmWebcam(NULL)
 #endif
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -550 +550 @@
 
 #ifdef VBOX_WITH_USB_VIDEO
-        unconst(mUsbWebcamInterface) = new UsbWebcamInterface(this);
-        AssertReturn(mUsbWebcamInterface, E_FAIL);
+        unconst(mEmWebcam) = new EmWebcam(this);
+        AssertReturn(mEmWebcam, E_FAIL);
 #endif
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -651 +651 @@
 
 #ifdef VBOX_WITH_USB_VIDEO
-    if (mUsbWebcamInterface)
-    {
-        delete mUsbWebcamInterface;
-        unconst(mUsbWebcamInterface) = NULL;
+    if (mEmWebcam)
+    {
+        delete mEmWebcam;
+        unconst(mEmWebcam) = NULL;
     }
 #endif

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

@@ -2396 +2396 @@
 
 #ifdef VBOX_WITH_USB_VIDEO
-
-                InsertConfigNode(pUsbDevices, "Webcam", &pDev);
-                InsertConfigNode(pDev,     "0", &pInst);
-                InsertConfigNode(pInst,    "Config", &pCfg);
-# if 0 /* Experiments with attaching */
-                InsertConfigInteger(pCfg, "USBVER", RT_BIT(2));
+                BOOL aEmulatedUSBWebcamEnabled = FALSE;
+                hrc = pMachine->COMGETTER(EmulatedUSBWebcameraEnabled)(&aEmulatedUSBWebcamEnabled);    H();
+                if (aEmulatedUSBWebcamEnabled)
+                {
+                    InsertConfigNode(pUsbDevices, "Webcam", &pDev);
+                    InsertConfigNode(pDev,     "0", &pInst);
+                    InsertConfigNode(pInst,    "Config", &pCfg);
+                    InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+# ifdef VBOX_WITH_USB_VIDEO_TEST
+                    InsertConfigString(pLunL0, "Driver", "WebcamFileFeeder");
+                    InsertConfigNode(pLunL0,   "Config", &pCfg);
+                    InsertConfigString(pCfg,   "DirToFeed", "out");
+# else
+                    InsertConfigString(pLunL0, "Driver", "EmWebcam");
+                    InsertConfigNode(pLunL0,   "Config", &pCfg);
+                    InsertConfigInteger(pCfg,  "Object", (uintptr_t)mEmWebcam);
 # endif
-                InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-# ifdef VBOX_WITH_USB_VIDEO_TEST
-                InsertConfigString(pLunL0,    "Driver", "WebcamFileFeeder");
-                InsertConfigNode(pLunL0,    "Config", &pCfg);
-                InsertConfigString(pCfg,   "DirToFeed", "out");
-# else
-                InsertConfigString(pLunL0,    "Driver", "UsbWebcamInterface");
-                InsertConfigNode(pLunL0,    "Config", &pCfg);
-                InsertConfigInteger(pCfg,   "Object", mUsbWebcamInterface);
-# endif
+                }
 #endif
+
 #ifdef VBOX_WITH_USB_CARDREADER
                 BOOL aEmulatedUSBCardReaderEnabled = FALSE;

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

@@ -28 +28 @@
 #ifdef VBOX_WITH_USB_CARDREADER
 # include "UsbCardReader.h"
+#endif
+#ifdef VBOX_WITH_USB_VIDEO
+# include "UsbWebcamInterface.h"
 #endif
 
@@ -2576 +2579 @@
 #ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    UsbWebcamInterface *pWebCam = pThis->mConsole->getUsbWebcamInterface();
-    return pWebCam->WebCamNotify(u32Id, pvData, cbData);
+    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
+    pWebcam->EmWebcamCbNotify(u32Id, pvData, cbData);
 #else
     NOREF(pvCallback);
@@ -2595 +2598 @@
 #ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    UsbWebcamInterface *pWebCam = pThis->mConsole->getUsbWebcamInterface();
-    return pWebCam->WebCamDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
+    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
+    pWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
 #else
     NOREF(pvCallback);
@@ -2616 +2619 @@
 #ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    UsbWebcamInterface *pWebCam = pThis->mConsole->getUsbWebcamInterface();
-    return pWebCam->WebCamControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
+    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
+    pWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
 #else
     NOREF(pvCallback);
@@ -2636 +2639 @@
 #ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
-    UsbWebcamInterface *pWebCam = pThis->mConsole->getUsbWebcamInterface();
-    return pWebCam->WebCamFrame(rcRequest, pDeviceCtx, pvUser, pFrame, cbFrame);
+    EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
+    pWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame);
 #else
     NOREF(pvCallback);
@@ -2696 +2699 @@
 
 int ConsoleVRDPServer::VideoInControl(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle,
-                                      VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq)
+                                      const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq)
 {
     int rc;

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

@@ -79 +79 @@
 
 #ifdef VBOX_WITH_USB_VIDEO
-    rc = pCallbacks->pfnRegister(pCallbacks, &UsbWebcamInterface::DrvReg);
+    rc = pCallbacks->pfnRegister(pCallbacks, &EmWebcam::DrvReg);
     if (RT_FAILURE(rc))
         return rc;