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

Timestamp:

Nov 7, 2018 1:56:14 PM (7 years ago)

Author:

vboxsync

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

126417

Message:

Recording: Bugfixes for Main and FE/Qt.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (10 diffs)
• VideoRec.cpp (modified) (9 diffs)
• VideoRecStream.cpp (modified) (6 diffs)

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

@@ -5616 +5616 @@
     if (pDisplay)
     {
-        const bool fEnabled =    Capture.mpVideoRecCtx
-                              && Capture.mpVideoRecCtx->IsStarted();
-
-        if (RT_BOOL(fEnable) != fEnabled)
+        const bool fIsEnabled =    Capture.mpVideoRecCtx
+                                && Capture.mpVideoRecCtx->IsStarted();
+
+        if (RT_BOOL(fEnable) != fIsEnabled)
         {
             LogRel(("VideoRec: %s\n", fEnable ? "Enabling" : "Disabling"));
@@ -5628 +5628 @@
             {
                 vrc = i_videoRecCreate();
+                if (RT_SUCCESS(vrc))
+                    vrc = i_videoRecStart();
+
                 if (RT_SUCCESS(vrc))
                 {
@@ -6904 +6907 @@
     AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
 
-    Settings.mapScreens.clear();
+    Settings.applyDefaults();
 
     for (unsigned long i = 0; i < (unsigned long)paCaptureScreens.size(); ++i)
@@ -6934 +6937 @@
     }
 
+    Assert(Settings.mapScreens.size() == paCaptureScreens.size());
+
     return VINF_SUCCESS;
 }
@@ -6961 +6966 @@
     }
 
+    settings::CaptureSettings Settings;
+    rc = i_videoRecGetSettings(Settings);
+    if (RT_SUCCESS(rc))
+    {
+        AssertPtr(Capture.mpVideoRecCtx);
+        rc = Capture.mpVideoRecCtx->Create(Settings);
+    }
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -6970 +6984 @@
 {
     if (Capture.mpVideoRecCtx)
+    {
         delete Capture.mpVideoRecCtx;
+        Capture.mpVideoRecCtx = NULL;
+    }
+
+    LogFlowThisFuncLeave();
 }
 
@@ -6987 +7006 @@
     LogRel(("VideoRec: Starting ...\n"));
 
-    settings::CaptureSettings Settings;
-    int rc = i_videoRecGetSettings(Settings);
-    if (RT_SUCCESS(rc))
-    {
-        rc = Capture.mpVideoRecCtx->Create(Settings);
-        if (RT_SUCCESS(rc))
-        {
-            for (unsigned uScreen = 0; uScreen < Capture.mpVideoRecCtx->GetStreamCount(); uScreen++)
-                mDisplay->i_videoRecScreenChanged(uScreen);
-        }
-    }
+    int rc = VINF_SUCCESS;
+
+    for (unsigned uScreen = 0; uScreen < Capture.mpVideoRecCtx->GetStreamCount(); uScreen++)
+        mDisplay->i_videoRecScreenChanged(uScreen);
 
     if (RT_FAILURE(rc))
         LogRel(("VideoRec: Failed to start video recording (%Rrc)\n", rc));
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -7010 +7023 @@
 int Console::i_videoRecStop(void)
 {
-    AssertPtrReturn(Capture.mpVideoRecCtx, VERR_WRONG_ORDER);
-
-    if (!Capture.mpVideoRecCtx->IsStarted())
+    if (   !Capture.mpVideoRecCtx
+        || !Capture.mpVideoRecCtx->IsStarted())
         return VINF_SUCCESS;
 
@@ -7020 +7032 @@
     for (unsigned uScreen = 0; uScreen < cStreams; ++uScreen)
         mDisplay->i_videoRecScreenChanged(uScreen);
-
-    delete Capture.mpVideoRecCtx;
-    Capture.mpVideoRecCtx = NULL;
 
     ComPtr<ICaptureSettings> pCaptureSettings;
@@ -7032 +7041 @@
     LogRel(("VideoRec: Stopped\n"));
 
+    LogFlowFuncLeaveRC(VINF_SUCCESS);
     return VINF_SUCCESS;
 }

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

@@ -58 +58 @@
 
 /**
- * Enumeration for a video recording state.
+ * Enumeration for a recording state.
  */
 enum VIDEORECSTS
@@ -64 +64 @@
     /** Not initialized. */
     VIDEORECSTS_UNINITIALIZED = 0,
-    /** Initialized. */
-    VIDEORECSTS_INITIALIZED   = 1,
+    /** Created. */
+    VIDEORECSTS_CREATED       = 1,
+    /** Started. */
+    VIDEORECSTS_STARTED       = 2,
     /** The usual 32-bit hack. */
     VIDEORECSTS_32BIT_HACK    = 0x7fffffff
@@ -105 +107 @@
 
 CaptureContext::CaptureContext(Console *a_pConsole)
-    : pConsole(a_pConsole) { }
+    : pConsole(a_pConsole)
+    , enmState(VIDEORECSTS_UNINITIALIZED) { }
 
 CaptureContext::CaptureContext(Console *a_pConsole, const settings::CaptureSettings &a_Settings)
     : pConsole(a_pConsole)
+    , enmState(VIDEORECSTS_UNINITIALIZED)
 {
     int rc = CaptureContext::createInternal(a_Settings);
@@ -214 +218 @@
     {
         this->tsStartMs = RTTimeMilliTS();
-        this->enmState  = VIDEORECSTS_UNINITIALIZED;
+        this->enmState  = VIDEORECSTS_CREATED;
         this->fStarted  = false;
         this->fShutdown = false;
@@ -223 +227 @@
         rc = RTSemEventCreate(&this->WaitEvent);
         AssertRCReturn(rc, rc);
-
-        rc = RTThreadCreate(&this->Thread, CaptureContext::threadMain, (void *)this, 0,
-                            RTTHREADTYPE_MAIN_WORKER, RTTHREADFLAGS_WAITABLE, "VideoRec");
-
-        if (RT_SUCCESS(rc)) /* Wait for the thread to start. */
-            rc = RTThreadUserWait(this->Thread, 30 * RT_MS_1SEC /* 30s timeout */);
-
-        if (RT_SUCCESS(rc))
-        {
-            this->enmState = VIDEORECSTS_INITIALIZED;
-            this->fStarted = true;
-        }
     }
 
@@ -246 +238 @@
 }
 
+int CaptureContext::startInternal(void)
+{
+    if (this->enmState == VIDEORECSTS_STARTED)
+        return VINF_SUCCESS;
+
+    Assert(this->enmState == VIDEORECSTS_CREATED);
+
+    int rc = RTThreadCreate(&this->Thread, CaptureContext::threadMain, (void *)this, 0,
+                            RTTHREADTYPE_MAIN_WORKER, RTTHREADFLAGS_WAITABLE, "VideoRec");
+
+    if (RT_SUCCESS(rc)) /* Wait for the thread to start. */
+        rc = RTThreadUserWait(this->Thread, 30 * RT_MS_1SEC /* 30s timeout */);
+
+    if (RT_SUCCESS(rc))
+    {
+        this->enmState = VIDEORECSTS_STARTED;
+        this->fStarted = true;
+    }
+
+    return rc;
+}
+
+int CaptureContext::stopInternal(void)
+{
+    if (this->enmState != VIDEORECSTS_STARTED)
+        return VINF_SUCCESS;
+
+    LogFunc(("Shutting down thread ...\n"));
+
+    /* Set shutdown indicator. */
+    ASMAtomicWriteBool(&this->fShutdown, true);
+
+    /* 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);
+
+    return rc;
+}
+
 /**
  * Destroys a video recording context.
@@ -253 +285 @@
     int rc = VINF_SUCCESS;
 
-    if (this->enmState == VIDEORECSTS_INITIALIZED)
-    {
-        LogFunc(("Shutting down thread ...\n"));
-
-        /* Set shutdown indicator. */
-        ASMAtomicWriteBool(&this->fShutdown, true);
-
-        /* Signal the thread and wait for it to shut down. */
-        rc = threadNotify();
-        if (RT_SUCCESS(rc))
-            rc = RTThreadWait(this->Thread, 30 * 1000 /* 10s timeout */, NULL);
-
+    if (this->enmState == VIDEORECSTS_STARTED)
+    {
+        rc = stopInternal();
         if (RT_SUCCESS(rc))
         {
@@ -365 +388 @@
 }
 
+int CaptureContext::Start(void)
+{
+    return startInternal();
+}
+
+int CaptureContext::Stop(void)
+{
+    return stopInternal();
+}
+
 bool CaptureContext::IsFeatureEnabled(CaptureFeature_T enmFeature) const
 {
@@ -394 +427 @@
     RT_NOREF(uTimeStampMs);
 
-    if (this->enmState != VIDEORECSTS_INITIALIZED)
+    if (this->enmState != VIDEORECSTS_STARTED)
         return false;
 

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

@@ -45 +45 @@
     : tsStartMs(0)
 {
+    File.pWEBM = NULL;
+    File.hFile = NIL_RTFILE;
 }
 
@@ -50 +52 @@
     : tsStartMs(0)
 {
+    File.pWEBM = NULL;
+    File.hFile = NIL_RTFILE;
+
     int rc2 = initInternal(uScreen, Settings);
     if (RT_FAILURE(rc2))
@@ -66 +71 @@
  * @returns IPRT status code.
  */
-int CaptureStream::open(void)
-{
-    Assert(ScreenSettings.enmDest == CaptureDestination_None);
+int CaptureStream::open(const settings::CaptureScreenSettings &Settings)
+{
+    /* Sanity. */
+    Assert(Settings.enmDest != CaptureDestination_None);
 
     int rc;
 
-    switch (ScreenSettings.enmDest)
+    switch (Settings.enmDest)
     {
         case CaptureDestination_File:
         {
-            Assert(ScreenSettings.File.strName.isNotEmpty());
-
-            char *pszAbsPath = RTPathAbsDup(ScreenSettings.File.strName.c_str());
+            Assert(Settings.File.strName.isNotEmpty());
+
+            char *pszAbsPath = RTPathAbsDup(Settings.File.strName.c_str());
             AssertPtrReturn(pszAbsPath, VERR_NO_MEMORY);
 
@@ -132 +138 @@
                     if (RT_SUCCESS(rc))
                         rc = RTFileOpen(&hFile, pszFile, fOpen);
+                }
+
+                try
+                {
+                    Assert(File.pWEBM == NULL);
+                    File.pWEBM = new WebMWriter();
+                }
+                catch (std::bad_alloc &)
+               {
+                    rc = VERR_NO_MEMORY;
                 }
 
@@ -656 +672 @@
         return rc;
 
-    rc = open();
+    rc = open(Settings);
     if (RT_FAILURE(rc))
         return rc;
@@ -675 +691 @@
             const char *pszFile = this->ScreenSettings.File.strName.c_str();
 
+            AssertPtr(File.pWEBM);
             rc = File.pWEBM->OpenEx(pszFile, &this->File.hFile,
 #ifdef VBOX_WITH_AUDIO_VIDEOREC