Changeset 75391 in vbox

Timestamp:

Nov 12, 2018 9:22:42 AM (6 years ago)

Author:

vboxsync

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

126526

Message:

Recording/Main: Logging.

Location:

trunk/src/VBox/Main/src-client

Files:

• Recording.cpp (modified) (3 diffs)
• RecordingStream.cpp (modified) (8 diffs)

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

@@ -145 +145 @@
 
         if (RT_FAILURE(rc))
-            LogRel(("Recording: Encoding thread failed with rc=%Rrc\n", rc));
+            LogRel(("Recording: Encoding thread failed (%Rrc)\n", rc));
 
         /* Keep going in case of errors. */
@@ -238 +238 @@
     if (RT_SUCCESS(rc))
     {
+        LogRel(("Recording: Started\n"));
         this->enmState = RECORDINGSTS_STARTED;
     }
+    else
+        Log(("Recording: Failed to start (%Rrc)\n", rc));
 
     return rc;
@@ -261 +264 @@
     if (RT_SUCCESS(rc))
     {
+        LogRel(("Recording: Stopped\n"));
         this->enmState = RECORDINGSTS_CREATED;
     }
+    else
+        Log(("Recording: Failed to stop (%Rrc)\n", rc));
 
     LogFlowThisFunc(("%Rrc\n", rc));

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

@@ -200 +200 @@
             else
             {
-                LogRel(("Recording: Setting encoder deadline to '%s'\n", value.c_str()));
                 this->Video.Codec.VPX.uEncoderDeadline = value.toUInt32();
 #endif
@@ -208 +207 @@
         {
             if (value.compare("false", Utf8Str::CaseInsensitive) == 0)
-            {
                 this->ScreenSettings.featureMap[RecordingFeature_Video] = false;
-#ifdef VBOX_WITH_AUDIO_RECORDING
-                LogRel(("Recording: Only audio will be recorded\n"));
-#endif
-            }
         }
         else if (key.compare("ac_enabled", Utf8Str::CaseInsensitive) == 0)
@@ -219 +213 @@
 #ifdef VBOX_WITH_AUDIO_RECORDING
             if (value.compare("true", Utf8Str::CaseInsensitive) == 0)
-            {
                 this->ScreenSettings.featureMap[RecordingFeature_Audio] = true;
-            }
-            else
-                LogRel(("Recording: Only video will be recorded\n"));
 #endif
         }
@@ -692 +682 @@
 
     if (fVideoEnabled)
+    {
         rc = initVideo();
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     if (fAudioEnabled)
+    {
         rc = initAudio();
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     switch (this->ScreenSettings.enmDest)
@@ -715 +713 @@
             if (RT_FAILURE(rc))
             {
-                LogRel(("Recording: Failed to create the capture output file '%s' (%Rrc)\n", pszFile, rc));
+                LogRel(("Recording: Failed to create output file '%s' (%Rrc)\n", pszFile, rc));
                 break;
             }
@@ -745 +743 @@
                 }
 
-                LogRel(("Recording: Recording audio in %RU16Hz, %RU8 bit, %RU8 %s (track #%RU8)\n",
-                        Settings.Audio.uHz, Settings.Audio.cBits, Settings.Audio.cChannels,
+                LogRel(("Recording: Recording audio of screen #%u in %RU16Hz, %RU8 bit, %RU8 %s (track #%RU8)\n",
+                        this->uScreenID, Settings.Audio.uHz, Settings.Audio.cBits, Settings.Audio.cChannels,
                         Settings.Audio.cChannels ? "channels" : "channel", this->uTrackAudio));
             }
@@ -768 +766 @@
                 }
 #endif
-                LogRel(("Recording: Recording %s to '%s'\n", szWhat, pszFile));
+                LogRel(("Recording: Recording %s of screen #%u to '%s'\n", szWhat, this->uScreenID, pszFile));
             }
 
@@ -956 +954 @@
     this->Video.uDelayMs = RT_MS_1SEC / this->ScreenSettings.Video.ulFPS;
 
+    int rc;
+
 #ifdef VBOX_WITH_LIBVPX
     /* At the moment we only have VPX. */
-    return initVideoVPX();
+    rc = initVideoVPX();
 #else
-    return VINF_SUCCESS;
-#endif
+    rc = VINF_SUCCESS;
+#endif
+
+    if (RT_FAILURE(rc))
+        LogRel(("Recording: Failed to initialize video encoding (%Rrc)\n", rc));
+
+    return rc;
 }