Changeset 65221 in vbox for trunk/src

Timestamp:

Jan 10, 2017 11:43:13 AM (8 years ago)

Author:

vboxsync

Message:

Main/VideoRec: Be more gentle for CaseInsensitive options, renamed key "quality" to "vc_quality", added options "ac_enabled" and "vc_enabled" options to enable/disable recording of audio/video separately.

File:

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

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

@@ -43 +43 @@
 static int videoRecEncodeAndWrite(PVIDEORECSTREAM pStrm);
 static int videoRecRGBToYUV(PVIDEORECSTREAM pStrm);
+
+using namespace com;
 
 /**
@@ -647 +649 @@
      * other important file, causing unintentional data loss. */
 
-    /** @todo Make mode configurable. */
+    vpx_codec_err_t rcv = vpx_codec_enc_config_default(DEFAULTCODEC, &pStream->Codec.VPX.Config, 0);
+    if (rcv != VPX_CODEC_OK)
+    {
+        LogRel(("VideoRec: Failed to get default configuration for VPX codec: %s\n", vpx_codec_err_to_string(rcv)));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    com::Utf8Str options(pszOptions);
+    size_t pos = 0;
+
+    /* By default we enable both, video and audio recording (if available). */
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     WebMWriter::Mode enmMode = WebMWriter::Mode_AudioVideo;
@@ -654 +666 @@
 #endif
 
-    uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_WRITE;
-#ifdef DEBUG
-    fOpen |= RTFILE_O_CREATE_REPLACE;
-#else
-    fOpen |= RTFILE_O_CREATE;
-#endif
-
-    int rc = pStream->pEBML->create(pszFile, fOpen, enmMode,
-                                    WebMWriter::AudioCodec_Opus, WebMWriter::VideoCodec_VP8);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("VideoRec: Failed to create the video capture output file '%s' (%Rrc)\n", pszFile, rc));
-        return rc;
-    }
-
-    vpx_codec_err_t rcv = vpx_codec_enc_config_default(DEFAULTCODEC, &pStream->Codec.VPX.Config, 0);
-    if (rcv != VPX_CODEC_OK)
-    {
-        LogFlow(("Failed to configure codec: %s\n", vpx_codec_err_to_string(rcv)));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    com::Utf8Str options(pszOptions);
-    size_t pos = 0;
-
     do {
 
@@ -684 +671 @@
         pos = options.parseKeyValue(key, value, pos);
 
-        if (key == "quality")
-        {
-            if (value == "realtime")
+        if (key.compare("vc_quality", Utf8Str::CaseInsensitive))
+        {
+            if (value.compare("realtime", Utf8Str::CaseInsensitive))
             {
                 pStream->uEncoderDeadline = VPX_DL_REALTIME;
             }
-            else if (value == "good")
+            else if (value.compare("good", Utf8Str::CaseInsensitive))
             {
                 pStream->uEncoderDeadline = 1000000 / uFps;
             }
-            else if (value == "best")
+            else if (value.compare("best", Utf8Str::CaseInsensitive))
             {
                 pStream->uEncoderDeadline = VPX_DL_BEST_QUALITY;
@@ -704 +691 @@
             }
         }
+        if (key.compare("vc_enabled", Utf8Str::CaseInsensitive))
+        {
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+            if (value.compare("false", Utf8Str::CaseInsensitive)) /* Disable audio. */
+            {
+                enmMode = WebMWriter::Mode_Audio;
+                LogRel(("VideoRec: Only audio will be recorded\n"));
+            }
+#endif
+        }
+        if (key.compare("ac_enabled", Utf8Str::CaseInsensitive))
+        {
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+            if (value.compare("false", Utf8Str::CaseInsensitive)) /* Disable audio. */
+            {
+                enmMode = WebMWriter::Mode_Video;
+                LogRel(("VideoRec: Only video will be recorded\n"));
+            }
+#endif
+        }
         else
             LogRel(("VideoRec: Unknown option '%s' (value '%s'), skipping\n", key.c_str(), value.c_str()));
 
     } while(pos != com::Utf8Str::npos);
+
+    uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_WRITE;
+#ifdef DEBUG
+    fOpen |= RTFILE_O_CREATE_REPLACE;
+#else
+    fOpen |= RTFILE_O_CREATE;
+#endif
+
+    int rc = pStream->pEBML->create(pszFile, fOpen, enmMode,
+                                    WebMWriter::AudioCodec_Opus, WebMWriter::VideoCodec_VP8);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VideoRec: Failed to create the video capture output file '%s' (%Rrc)\n", pszFile, rc));
+        return rc;
+    }
 
     /* target bitrate in kilobits per second */