Changeset 94950 in vbox

Timestamp:

May 9, 2022 11:49:03 AM (3 years ago)

Author:

vboxsync

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

151358

Message:

Main/src-client/Recording.cpp: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

File:

• trunk/src/VBox/Main/src-client/Recording.cpp (modified) (18 diffs)

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

@@ -63 +63 @@
     , cStreamsEnabled(0)
 {
-    int rc = RecordingContext::createInternal(a_Settings);
-    if (RT_FAILURE(rc))
-        throw rc;
+    int vrc = RecordingContext::createInternal(a_Settings);
+    if (RT_FAILURE(vrc))
+        throw vrc;
 }
 
@@ -89 +89 @@
     for (;;)
     {
-        int rc = RTSemEventWait(pThis->WaitEvent, RT_INDEFINITE_WAIT);
-        AssertRCBreak(rc);
+        int vrc = RTSemEventWait(pThis->WaitEvent, RT_INDEFINITE_WAIT);
+        AssertRCBreak(vrc);
 
         Log2Func(("Processing %zu streams\n", pThis->vecStreams.size()));
@@ -102 +102 @@
             RecordingStream *pStream = (*itStream);
 
-            rc = pStream->Process(pThis->mapBlocksCommon);
-            if (RT_FAILURE(rc))
+            vrc = pStream->Process(pThis->mapBlocksCommon);
+            if (RT_FAILURE(vrc))
             {
-                LogRel(("Recording: Processing stream #%RU16 failed (%Rrc)\n", pStream->GetID(), rc));
+                LogRel(("Recording: Processing stream #%RU16 failed (%Rrc)\n", pStream->GetID(), vrc));
                 break;
             }
@@ -112 +112 @@
         }
 
-        if (RT_FAILURE(rc))
-            LogRel(("Recording: Encoding thread failed (%Rrc)\n", rc));
+        if (RT_FAILURE(vrc))
+            LogRel(("Recording: Encoding thread failed (%Rrc)\n", vrc));
 
         /* Keep going in case of errors. */
@@ -147 +147 @@
 int RecordingContext::createInternal(const settings::RecordingSettings &a_Settings)
 {
-    int rc = RTCritSectInit(&this->CritSect);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = RTCritSectInit(&this->CritSect);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     settings::RecordingScreenMap::const_iterator itScreen = a_Settings.mapScreens.begin();
@@ -164 +164 @@
         catch (std::bad_alloc &)
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
             break;
         }
@@ -171 +171 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         this->tsStartMs = RTTimeMilliTS();
@@ -180 +180 @@
         this->Settings  = a_Settings;
 
-        rc = RTSemEventCreate(&this->WaitEvent);
-        AssertRCReturn(rc, rc);
-    }
-
-    if (RT_FAILURE(rc))
+        vrc = RTSemEventCreate(&this->WaitEvent);
+        AssertRCReturn(vrc, vrc);
+    }
+
+    if (RT_FAILURE(vrc))
         destroyInternal();
 
-    return rc;
+    return vrc;
 }
 
@@ -202 +202 @@
     Assert(this->enmState == RECORDINGSTS_CREATED);
 
-    int rc = RTThreadCreate(&this->Thread, RecordingContext::threadMain, (void *)this, 0,
-                            RTTHREADTYPE_MAIN_WORKER, RTTHREADFLAGS_WAITABLE, "Record");
-
-    if (RT_SUCCESS(rc)) /* Wait for the thread to start. */
-        rc = RTThreadUserWait(this->Thread, 30 * RT_MS_1SEC /* 30s timeout */);
-
-    if (RT_SUCCESS(rc))
+    int vrc = RTThreadCreate(&this->Thread, RecordingContext::threadMain, (void *)this, 0,
+                             RTTHREADTYPE_MAIN_WORKER, RTTHREADFLAGS_WAITABLE, "Record");
+
+    if (RT_SUCCESS(vrc)) /* Wait for the thread to start. */
+        vrc = RTThreadUserWait(this->Thread, 30 * RT_MS_1SEC /* 30s timeout */);
+
+    if (RT_SUCCESS(vrc))
     {
         LogRel(("Recording: Started\n"));
@@ -214 +214 @@
     }
     else
-        Log(("Recording: Failed to start (%Rrc)\n", rc));
-
-    return rc;
+        Log(("Recording: Failed to start (%Rrc)\n", vrc));
+
+    return vrc;
 }
 
@@ -235 +235 @@
 
     /* Signal the thread and wait for it to shut down. */
-    int rc = threadNotify();
-    if (RT_SUCCESS(rc))
-        rc = RTThreadWait(this->Thread, 30 * 1000 /* 10s timeout */, NULL);
-
-    lock();
-
-    if (RT_SUCCESS(rc))
+    int vrc = threadNotify();
+    if (RT_SUCCESS(vrc))
+        vrc = RTThreadWait(this->Thread, 30 * 1000 /* 10s timeout */, NULL);
+
+    lock();
+
+    if (RT_SUCCESS(vrc))
     {
         LogRel(("Recording: Stopped\n"));
@@ -247 +247 @@
     }
     else
-        Log(("Recording: Failed to stop (%Rrc)\n", rc));
-
-    unlock();
-
-    LogFlowThisFunc(("%Rrc\n", rc));
-    return rc;
+        Log(("Recording: Failed to stop (%Rrc)\n", vrc));
+
+    unlock();
+
+    LogFlowThisFunc(("%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -263 +263 @@
         return;
 
-    int rc = stopInternal();
-    AssertRCReturnVoid(rc);
-
-    lock();
-
-    rc = RTSemEventDestroy(this->WaitEvent);
-    AssertRCReturnVoid(rc);
+    int vrc = stopInternal();
+    AssertRCReturnVoid(vrc);
+
+    lock();
+
+    vrc = RTSemEventDestroy(this->WaitEvent);
+    AssertRCReturnVoid(vrc);
 
     this->WaitEvent = NIL_RTSEMEVENT;
@@ -278 +278 @@
         RecordingStream *pStream = (*it);
 
-        rc = pStream->Uninit();
-        AssertRC(rc);
+        vrc = pStream->Uninit();
+        AssertRC(vrc);
 
         delete pStream;
@@ -337 +337 @@
 int RecordingContext::lock(void)
 {
-    int rc = RTCritSectEnter(&this->CritSect);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectEnter(&this->CritSect);
+    AssertRC(vrc);
+    return vrc;
 }
 
 int RecordingContext::unlock(void)
 {
-    int rc = RTCritSectLeave(&this->CritSect);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectLeave(&this->CritSect);
+    AssertRC(vrc);
+    return vrc;
 }
 
@@ -599 +599 @@
     lock();
 
-    int rc;
+    int vrc;
 
     try
@@ -614 +614 @@
             itBlocks->second->List.push_back(pBlock);
 
-        rc = VINF_SUCCESS;
+        vrc = VINF_SUCCESS;
     }
     catch (const std::exception &ex)
     {
         RT_NOREF(ex);
-        rc = VERR_NO_MEMORY;
-    }
-
-    unlock();
-
-    if (RT_SUCCESS(rc))
-        rc = threadNotify();
-
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+
+    unlock();
+
+    if (RT_SUCCESS(vrc))
+        vrc = threadNotify();
+
+    return vrc;
 #else
     RT_NOREF(pvData, cbData, msTimestamp);
@@ -672 +672 @@
     }
 
-    int rc = pStream->SendVideoFrame(x, y, uPixelFormat, uBPP, uBytesPerLine, uSrcWidth, uSrcHeight, puSrcData, msTimestamp);
-
-    unlock();
-
-    if (   RT_SUCCESS(rc)
-        && rc != VINF_RECORDING_THROTTLED) /* Only signal the thread if operation was successful. */
+    int vrc = pStream->SendVideoFrame(x, y, uPixelFormat, uBPP, uBytesPerLine, uSrcWidth, uSrcHeight, puSrcData, msTimestamp);
+
+    unlock();
+
+    if (   RT_SUCCESS(vrc)
+        && vrc != VINF_RECORDING_THROTTLED) /* Only signal the thread if operation was successful. */
     {
         threadNotify();
     }
 
-    return rc;
-}
-
+    return vrc;
+}
+