Changeset 37282 in vbox for trunk/src/VBox

Timestamp:

Jun 1, 2011 2:56:05 AM (14 years ago)

Author:

vboxsync

Message:

Main,ExtPacks/Puel/UsbWebcam: UsbWebcam intergration.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• include/ConsoleVRDPServer.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (1 diff)
• src-client/VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -62 +62 @@
         $(if $(VBOX_WITH_GUEST_PROPS_RDONLY_GUEST),VBOX_WITH_GUEST_PROPS_RDONLY_GUEST,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
+        $(if $(VBOX_WITH_USB_VIDEO),VBOX_WITH_USB_VIDEO,) \
         $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,)
 
@@ -632 +633 @@
         src-all/VirtualBoxErrorInfoImpl.cpp \
         $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
+        $(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
         src-client/AdditionsFacilityImpl.cpp \
         src-client/AudioSnifferInterface.cpp \

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

@@ -35 +35 @@
 class VRDEServerInfo;
 class AudioSniffer;
+#ifdef VBOX_WITH_USB_VIDEO
+class UsbWebcamInterface;
+#endif
 class ConsoleVRDPServer;
 class VMMDev;
@@ -719 +722 @@
     VMMDev * m_pVMMDev;
     AudioSniffer * const mAudioSniffer;
+#ifdef VBOX_WITH_USB_VIDEO
+    UsbWebcamInterface * const mUsbWebcamInterface;
+#endif
     BusAssignmentManager* mBusMgr;
 

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

@@ -136 +136 @@
 
     void SendAudioInputEnd(void *pvUserCtx);
+#ifdef VBOX_WITH_USB_VIDEO
+    int GetVideoFrameDimensions(uint16_t *pu16Heigh, uint16_t *pu16Width);
+    int SendVideoSreamOn(bool fFetch);
+#endif
 
 private:

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

@@ -57 +57 @@
 #include "SharedFolderImpl.h"
 #include "AudioSnifferInterface.h"
+#include "UsbWebcamInterface.h"
 #include "ProgressCombinedImpl.h"
 #include "ConsoleVRDPServer.h"
@@ -368 +369 @@
     , m_pVMMDev(NULL)
     , mAudioSniffer(NULL)
+#ifdef VBOX_WITH_USB_VIDEO
+    , mUsbWebcamInterface(NULL)
+#endif
     , mBusMgr(NULL)
     , mVMStateChangeCallbackDisabled(false)
@@ -504 +508 @@
     unconst(mAudioSniffer) = new AudioSniffer(this);
     AssertReturn(mAudioSniffer, E_FAIL);
+#ifdef VBOX_WITH_USB_VIDEO
+    unconst(mUsbWebcamInterface) = new UsbWebcamInterface(this);
+    AssertReturn(mUsbWebcamInterface, E_FAIL);
+#endif
 
     /* VirtualBox events registration. */
@@ -594 +602 @@
         mpVmm2UserMethods = NULL;
     }
+
+#ifdef VBOX_WITH_USB_VIDEO
+    if (mUsbWebcamInterface)
+    {
+        delete mUsbWebcamInterface;
+        unconst(mUsbWebcamInterface) = NULL;
+    }
+#endif
 
     if (mAudioSniffer)

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

@@ -2273 +2273 @@
 #endif
 
-# if 0  /* Virtual Webcam */
+#ifdef VBOX_WITH_USB_VIDEO
 
                 InsertConfigNode(pUsbDevices, "Webcam", &pDev);
@@ -2282 +2282 @@
 # endif
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+# ifdef VBOX_WITH_USB_VIDEO_TEST
                 InsertConfigString(pLunL0,    "Driver", "WebcamFileFeeder");
                 InsertConfigNode(pLunL0,    "Config", &pCfg);
-# if 1
                 InsertConfigString(pCfg,   "DirToFeed", "out");
+# else
+                InsertConfigString(pLunL0,    "Driver", "UsbWebcamInterface");
+                InsertConfigNode(pLunL0,    "Config", &pCfg);
+                InsertConfigInteger(pCfg,   "Object", &mUsbWebcamInterface);
 # endif
-# endif
+#endif
 # if 0  /* Virtual MSD*/
 

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

@@ -2770 +2770 @@
     }
 }
+
+#ifdef VBOX_WITH_USB_VIDEO
+int ConsoleVRDPServer::GetVideoFrameDimensions(uint16_t *pu16Heigh, uint16_t *pu16Width)
+{
+    *pu16Heigh = 640;
+    *pu16Width = 480;
+    return VINF_SUCCESS;
+}
+
+int ConsoleVRDPServer::SendVideoSreamOn(bool fFetch)
+{
+    /* Here we inform server that guest is starting/stopping
+     * the stream
+     */
+    return VINF_SUCCESS;
+}
+#endif
 
 

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

@@ -25 +25 @@
 #include "VMMDev.h"
 #include "AudioSnifferInterface.h"
+#ifdef VBOX_WITH_USB_VIDEO
+# include "UsbWebcamInterface.h"
+#endif
 #include "ConsoleImpl.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
@@ -67 +70 @@
         return rc;
 
+#ifdef VBOX_WITH_USB_VIDEO
+    rc = pCallbacks->pfnRegister(pCallbacks, &UsbWebcamInterface::DrvReg);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+
     rc = pCallbacks->pfnRegister(pCallbacks, &Console::DrvStatusReg);
     if (RT_FAILURE(rc))