Changeset 52390 in vbox

Timestamp:

Aug 15, 2014 4:34:10 PM (10 years ago)

Author:

vboxsync

Message:

Main/crOpenGL: fix video recording

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -152 +152 @@
     bool i_handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t u64TimeStamp);
     void i_handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp);
-    void i_handleVRecCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext);
+    void i_handleVRecCompletion();
 #endif
 
@@ -320 +320 @@
     static DECLCALLBACK(void) i_displayCrVRecScreenshotEnd(void *pvCtx, uint32_t uScreen, uint64_t u64TimeStamp);
 
-    static DECLCALLBACK(void) i_displayVRecCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam,
-                                                      void *pvContext);
+    static DECLCALLBACK(void) i_displayVRecCompletion(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion);
 #endif
     static DECLCALLBACK(void) i_displayCrCmdFree(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion);

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

@@ -3753 +3753 @@
                         pData->aParms[0].u.pointer.addr = &pDisplay->mCrOglScreenshotData;
                         pData->aParms[0].u.pointer.size = sizeof(pDisplay->mCrOglScreenshotData);
-                        rc = pDisplay->i_crCtlSubmit(&pData->Hdr, sizeof(*pData), NULL, NULL);
-                        if (!RT_SUCCESS(rc))
+                        rc = pDisplay->i_crCtlSubmit(&pData->Hdr, sizeof(*pData), Display::i_displayVRecCompletion, pDisplay);
+                        if (RT_SUCCESS(rc))
+                            break;
+                        else
                             AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
                     }
@@ -4400 +4402 @@
 }
 
-void  Display::i_handleVRecCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
+void  Display::i_handleVRecCompletion()
 {
     Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
@@ -4431 +4433 @@
 }
 
-DECLCALLBACK(void) Display::i_displayVRecCompletion(int32_t result, uint32_t u32Function,
-                                                    PVBOXHGCMSVCPARM pParam, void *pvContext)
-{
-    Display *pDisplay = (Display *)pvContext;
-    pDisplay->i_handleVRecCompletion(result, u32Function, pParam, pvContext);
+DECLCALLBACK(void) Display::i_displayVRecCompletion(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion)
+{
+    Display *pDisplay = (Display *)pvCompletion;
+    pDisplay->i_handleVRecCompletion();
 }