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

Timestamp:

Jul 26, 2013 6:55:18 AM (12 years ago)

Author:

vboxsync

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

87566

Message:

include,Main,Extpack: emulated webcam updates

File:

• trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp (modified) (3 diffs)

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

@@ -51 +51 @@
 
 
+static DECLCALLBACK(void) drvEmWebcamReady(PPDMIWEBCAMDOWN pInterface,
+                                           bool fReady)
+{
+    PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown);
+    NOREF(pThis);
+    NOREF(fReady);
+}
+
 static DECLCALLBACK(int) drvEmWebcamControl(PPDMIWEBCAMDOWN pInterface,
                                             void *pvUser,
@@ -270 +278 @@
     if (mpDrv && mpDrv->pIWebcamUp)
     {
-        mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp,
-                                            mpRemote->u64DeviceId,
-                                            (const uint8_t *)pFrame,
-                                            cbFrame);
+        if (   cbFrame >= sizeof(VRDEVIDEOINPAYLOADHDR)
+            && cbFrame >= pFrame->u8HeaderLength)
+        {
+            uint32_t cbImage = cbFrame - pFrame->u8HeaderLength;
+            const uint8_t *pu8Image = cbImage > 0? (const uint8_t *)pFrame + pFrame->u8HeaderLength: NULL;
+
+            mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp,
+                                                mpRemote->u64DeviceId,
+                                                (PDMIWEBCAM_FRAMEHDR *)pFrame,
+                                                pFrame->u8HeaderLength,
+                                                pu8Image,
+                                                cbImage);
+        }
     }
 }
@@ -380 +397 @@
     pDrvIns->IBase.pfnQueryInterface = drvQueryInterface;
 
+    pThis->IWebcamDown.pfnWebcamDownReady = drvEmWebcamReady;
     pThis->IWebcamDown.pfnWebcamDownControl = drvEmWebcamControl;