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

Timestamp:

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

Author:

vboxsync

Message:

Recording: Bugfixes for Main and FE/Qt.

File:

• trunk/src/VBox/Main/src-client/VideoRecStream.cpp (modified) (6 diffs)

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