Changeset 62139 in vbox for trunk

Timestamp:

Jul 8, 2016 1:32:43 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8389: Main: fixed video recording with VBoxheadless

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (3 diffs)
• src-client/DisplayImpl.cpp (modified) (8 diffs)

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

@@ -95 +95 @@
     } pendingViewportInfo;
 #endif /* VBOX_WITH_CROGL */
+
+#ifdef VBOX_WITH_VPX
+    struct
+    {
+        ComPtr<IDisplaySourceBitmap> pSourceBitmap;
+    } videoCapture;
+#endif
 } DISPLAYFBINFO;
 
@@ -195 +202 @@
     void i_VideoCaptureStop();
     int  i_VideoCaptureEnableScreens(ComSafeArrayIn(BOOL, aScreens));
+#ifdef VBOX_WITH_VPX
+    void videoCaptureScreenChanged(unsigned uScreenId);
+#endif
 
     void i_notifyPowerDown(void);
@@ -449 +459 @@
     /* Serializes access to mVideoAccelLegacy and mfVideoAccelVRDP, etc between VRDP and Display. */
     RTCRITSECT mVideoAccelLock;
+#ifdef VBOX_WITH_VPX
+    /* Serializes access to video capture source bitmaps. */
+    RTCRITSECT mVideoCaptureLock;
+#endif
 
 public:

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

@@ -132 +132 @@
 #endif
 #ifdef VBOX_WITH_VPX
+    rc = RTCritSectInit(&mVideoCaptureLock);
+    AssertRC(rc);
+
     mpVideoRecCtx = NULL;
     for (unsigned i = 0; i < RT_ELEMENTS(maVideoRecEnabled); i++)
@@ -159 +162 @@
 {
     uninit();
+
+#ifdef VBOX_WITH_VPX
+    if (RTCritSectIsInitialized(&mVideoCaptureLock))
+    {
+        RTCritSectDelete(&mVideoCaptureLock);
+        RT_ZERO(mVideoCaptureLock);
+    }
+#endif
 
     videoAccelDestroy(&mVideoAccelLegacy);
@@ -703 +714 @@
         maFramebuffers[uScreenId].updateImage.cbLine = 0;
         maFramebuffers[uScreenId].pFramebuffer.setNull();
+#ifdef VBOX_WITH_VPX
+        maFramebuffers[uScreenId].videoCapture.pSourceBitmap.setNull();
+#endif
     }
 
@@ -961 +975 @@
     if (mfSeamlessEnabled)
         i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
+
+#ifdef VBOX_WITH_VPX
+    videoCaptureScreenChanged(uScreenId);
+#endif
 
     LogRelFlowFunc(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
@@ -2221 +2239 @@
     com::SafeArray<BOOL> Screens(ComSafeArrayInArg(aScreens));
     for (unsigned i = 0; i < Screens.size(); i++)
+    {
+        bool fChanged = maVideoRecEnabled[i] != RT_BOOL(Screens[i]);
+
         maVideoRecEnabled[i] = RT_BOOL(Screens[i]);
+
+        if (fChanged && i < mcMonitors)
+            videoCaptureScreenChanged(i);
+
+    }
     return VINF_SUCCESS;
 #else
@@ -2330 +2356 @@
             LogRel(("Display::VideoCaptureStart: WebM/VP8 video recording screen #%u with %ux%u @ %u kbps, %u fps to '%s' "
                     "enabled\n", uScreen, ulWidth, ulHeight, ulRate, ulFPS, pszName));
+
+            videoCaptureScreenChanged(uScreen);
         }
         else
@@ -2353 +2381 @@
     VideoRecContextClose(mpVideoRecCtx);
     mpVideoRecCtx = NULL;
-#endif
-}
+
+    unsigned uScreenId;
+    for (uScreenId = 0; uScreenId < mcMonitors; ++uScreenId)
+        videoCaptureScreenChanged(uScreenId);
+#endif
+}
+
+#ifdef VBOX_WITH_VPX
+void Display::videoCaptureScreenChanged(unsigned uScreenId)
+{
+    ComPtr<IDisplaySourceBitmap> pSourceBitmap;
+
+    if (VideoRecIsEnabled(mpVideoRecCtx) && maVideoRecEnabled[uScreenId])
+    {
+        /* Get a new source bitmap which will be used by video capture code. */
+        QuerySourceBitmap(uScreenId, pSourceBitmap.asOutParam());
+    }
+
+    int rc = RTCritSectEnter(&mVideoCaptureLock);
+    if (RT_SUCCESS(rc))
+    {
+        maFramebuffers[uScreenId].videoCapture.pSourceBitmap = pSourceBitmap;
+        RTCritSectLeave(&mVideoCaptureLock);
+    }
+}
+#endif
 
 int Display::i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address,
@@ -3107 +3159 @@
 
                 DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
-
-                if (   !pFBInfo->pFramebuffer.isNull()
-                    && !pFBInfo->fDisabled)
+                if (!pFBInfo->fDisabled)
                 {
-                    rc = VERR_NOT_SUPPORTED;
-                    if (   pFBInfo->fVBVAEnabled
-                        && pFBInfo->pu8FramebufferVRAM)
+                    ComPtr<IDisplaySourceBitmap> pSourceBitmap;
+                    int rc2 = RTCritSectEnter(&pDisplay->mVideoCaptureLock);
+                    if (RT_SUCCESS(rc2))
                     {
-                        rc = VideoRecCopyToIntBuf(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
-                                                  BitmapFormat_BGR,
-                                                  pFBInfo->u16BitsPerPixel,
-                                                  pFBInfo->u32LineSize, pFBInfo->w, pFBInfo->h,
-                                                  pFBInfo->pu8FramebufferVRAM, u64Now);
+                        pSourceBitmap = pFBInfo->videoCapture.pSourceBitmap;
+                        RTCritSectLeave(&pDisplay->mVideoCaptureLock);
                     }
-                    else if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && pDrv->IConnector.pbData)
+
+                    if (!pSourceBitmap.isNull())
                     {
-                        rc = VideoRecCopyToIntBuf(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
-                                                  BitmapFormat_BGR,
-                                                  pDrv->IConnector.cBits,
-                                                  pDrv->IConnector.cbScanline, pDrv->IConnector.cx,
-                                                  pDrv->IConnector.cy, pDrv->IConnector.pbData, u64Now);
+                        BYTE *pbAddress = NULL;
+                        ULONG ulWidth = 0;
+                        ULONG ulHeight = 0;
+                        ULONG ulBitsPerPixel = 0;
+                        ULONG ulBytesPerLine = 0;
+                        BitmapFormat_T bitmapFormat = BitmapFormat_Opaque;
+                        HRESULT hr = pSourceBitmap->QueryBitmapInfo(&pbAddress,
+                                                                    &ulWidth,
+                                                                    &ulHeight,
+                                                                    &ulBitsPerPixel,
+                                                                    &ulBytesPerLine,
+                                                                    &bitmapFormat);
+                        if (SUCCEEDED(hr) && pbAddress)
+                            rc = VideoRecCopyToIntBuf(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
+                                                      BitmapFormat_BGR,
+                                                      ulBitsPerPixel, ulBytesPerLine, ulWidth, ulHeight,
+                                                      pbAddress, u64Now);
+                        else
+                            rc = VERR_NOT_SUPPORTED;
+
+                        pSourceBitmap.setNull();
                     }
+                    else
+                        rc = VERR_NOT_SUPPORTED;
+
                     if (rc == VINF_TRY_AGAIN)
                         break;