Changeset 46553 in vbox for trunk

Timestamp:

Jun 14, 2013 12:15:06 PM (12 years ago)

Author:

vboxsync

Message:

Main/VPX: more race fixes

File:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (modified) (5 diffs)

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

@@ -49 +49 @@
     VIDREC_COPYING = 2,
     /* signal that we are terminating */
-    VIDREC_TERMINATING = 2
+    VIDREC_TERMINATING = 3
 };
 static uint32_t g_enmState = VIDREC_UNINITIALIZED;
@@ -394 +394 @@
         {
             PVIDEORECSTREAM pStrm = &pCtx->Strm[uScreen];
-            if (ASMAtomicReadBool(&pStrm->fRgbFilled))
+            if (   pStrm->fEnabled
+                && ASMAtomicReadBool(&pStrm->fRgbFilled))
             {
                 rc = videoRecRGBToYUV(pStrm);
@@ -590 +591 @@
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pCtx)
 {
-    if (!pCtx)
-        return false;
-
-    return pCtx->fEnabled;
+    uint32_t enmState = ASMAtomicReadU32(&g_enmState);
+    return (   enmState == VIDREC_IDLE
+            || enmState == VIDREC_COPYING);
 }
 
@@ -720 +720 @@
 
         PVIDEORECSTREAM pStrm = &pCtx->Strm[uScreen];
-
+        if (!pStrm->fEnabled)
+        {
+            rc = VINF_TRY_AGAIN; /* not (yet) enabled */
+            break;
+        }
         if (u64TimeStamp < pStrm->u64LastTimeStamp + pStrm->uDelay)
         {
@@ -726 +730 @@
             break;
         }
-
         if (ASMAtomicReadBool(&pStrm->fRgbFilled))
         {