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

Timestamp:

Aug 31, 2012 2:18:10 PM (13 years ago)

Author:

vboxsync

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

80512

Message:

Main/Display: clean up the interface to the video recording code

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (8 diffs)

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

@@ -445 +445 @@
 
 #ifdef VBOX_WITH_VPX
-    BOOL fEnabled = false;
     if (VideoRecContextCreate(&mpVideoRecContext))
     {
@@ -451 +450 @@
         return E_FAIL;
     }
-    int rc = RTCritSectInit(&mpVideoRecContext->CritSect);
-    AssertRCReturn(rc, E_UNEXPECTED);
-
-    mpVideoRecContext->fEnabled = false;
+
+    BOOL fEnabled = false;
     mParent->machine()->COMGETTER(VideoCaptureEnabled)(&fEnabled);
     if (fEnabled)
@@ -465 +462 @@
         mParent->machine()->COMGETTER(VideoCaptureFile)(&strVideoCaptureFile);
         LogFlow(("VidoeRecording VPX enabled\n"));
-        if (VideoRecContextInit(mpVideoRecContext,strVideoCaptureFile,
+        if (VideoRecContextInit(mpVideoRecContext, strVideoCaptureFile,
                                 ulVideoCaptureHorzRes, ulVideoCaptureVertRes))
         {
@@ -471 +468 @@
             return E_FAIL;
         }
-        mpVideoRecContext->fEnabled = true;
     }
 #endif
@@ -564 +560 @@
 
 #ifdef VBOX_WITH_VPX
-    if (   mpVideoRecContext
-        && mpVideoRecContext->fEnabled)
+    if (mpVideoRecContext)
         VideoRecContextClose(mpVideoRecContext);
 #endif
@@ -3281 +3276 @@
 
 #ifdef VBOX_WITH_VPX
-    if (pDisplay->mpVideoRecContext->fEnabled)
+    if (VideoRecIsEnabled(pDisplay->mpVideoRecContext))
     {
         uint32_t u32VideoRecImgFormat = VPX_IMG_FMT_NONE;
@@ -3334 +3329 @@
             }
 
-                /* Just return in case of filure without any assertion */
+                /* Just return in case of failure without any assertion */
                 if( RT_SUCCESS(rc))
                     if (RT_SUCCESS(VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat)))
@@ -3341 +3336 @@
     }
 #endif
-
-
 
 #ifdef DEBUG_sunlover