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

Timestamp:

Feb 3, 2014 7:29:26 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL/VideoRec: do hardweight screen capthure only when recorder is ready

Location:

trunk/src/VBox/Main/src-client

Files:

• DisplayImpl.cpp (modified) (5 diffs)
• VideoRec.cpp (modified) (1 diff)
• VideoRec.h (modified) (1 diff)

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

@@ -155 +155 @@
     mCrOglScreenshotData.u32Screen = CRSCREEN_ALL;
     mCrOglScreenshotData.pvContext = this;
-    mCrOglScreenshotData.pfnScreenshot = displayCrVRecScreenshot;
+    mCrOglScreenshotData.pfnScreenshotBegin = displayCrVRecScreenshotBegin;
+    mCrOglScreenshotData.pfnScreenshotPerform = displayCrVRecScreenshotPerform;
+    mCrOglScreenshotData.pfnScreenshotEnd = displayCrVRecScreenshotEnd;
 #endif
 
@@ -4205 +4207 @@
 }
 
-
-void  Display::handleCrVRecScreenshot(uint32_t uScreen,
+bool  Display::handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t u64TimeStamp)
+{
+    return VideoRecIsReady(mpVideoRecCtx, uScreen, u64TimeStamp);
+}
+
+void  Display::handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp)
+{
+}
+
+void  Display::handleCrVRecScreenshotPerform(uint32_t uScreen,
                 uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBitsPerPixel,
                 uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
@@ -4217 +4227 @@
                               uGuestWidth, uGuestHeight,
                               pu8BufferAddress, u64TimeStamp);
-    Assert(rc == VINF_SUCCESS || rc == VERR_TRY_AGAIN || rc == VINF_TRY_AGAIN);
+    Assert(rc == VINF_SUCCESS/* || rc == VERR_TRY_AGAIN || rc == VINF_TRY_AGAIN*/);
 }
 
@@ -4226 +4236 @@
 }
 
-DECLCALLBACK(void) Display::displayCrVRecScreenshot(void *pvCtx, uint32_t uScreen,
+DECLCALLBACK(void) Display::displayCrVRecScreenshotPerform(void *pvCtx, uint32_t uScreen,
                 uint32_t x, uint32_t y, uint32_t uBitsPerPixel,
                 uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
@@ -4232 +4242 @@
 {
     Display *pDisplay = (Display *)pvCtx;
-    pDisplay->handleCrVRecScreenshot(uScreen,
+    pDisplay->handleCrVRecScreenshotPerform(uScreen,
             x, y, FramebufferPixelFormat_FOURCC_RGB, uBitsPerPixel,
             uBytesPerLine, uGuestWidth, uGuestHeight,
             pu8BufferAddress, u64TimeStamp);
+}
+
+DECLCALLBACK(bool) Display::displayCrVRecScreenshotBegin(void *pvCtx, uint32_t uScreen, uint64_t u64TimeStamp)
+{
+    Display *pDisplay = (Display *)pvCtx;
+    return pDisplay->handleCrVRecScreenshotBegin(uScreen, u64TimeStamp);
+}
+
+DECLCALLBACK(void) Display::displayCrVRecScreenshotEnd(void *pvCtx, uint32_t uScreen, uint64_t u64TimeStamp)
+{
+    Display *pDisplay = (Display *)pvCtx;
+    pDisplay->handleCrVRecScreenshotEnd(uScreen, u64TimeStamp);
 }
 

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

@@ -603 +603 @@
 
 /**
+ * VideoRec utility function to check if recording engine is ready to accept a new frame
+ * for the given screen.
+ *
+ * @returns true if recording engine is ready
+ * @param   pCtx   Pointer to video recording context.
+ * @param   uScreen screen id.
+ * @param   u64TimeStamp current time stamp
+ */
+bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStamp)
+{
+    uint32_t enmState = ASMAtomicReadU32(&g_enmState);
+    if (enmState != VIDREC_IDLE)
+        return false;
+
+    PVIDEORECSTREAM pStrm = &pCtx->Strm[uScreen];
+    if (!pStrm->fEnabled)
+        return false;
+
+    if (u64TimeStamp < pStrm->u64LastTimeStamp + pStrm->uDelay)
+        return false;
+
+    if (ASMAtomicReadBool(&pStrm->fRgbFilled))
+        return false;
+
+    return true;
+}
+
+/**
  * VideoRec utility function to encode the source image and write the encoded
  * image to target file.

trunk/src/VBox/Main/src-client/VideoRec.h

@@ -34 +34 @@
                           uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
                           uint8_t *pu8BufferAddress, uint64_t u64TimeStamp);
+bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStamp);
 
 #endif /* !____H_VIDEOREC */