Changeset 96141 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Aug 11, 2022 3:37:19 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main:

• Renamed RecordingVideoScalingMethod -> RecordingVideoScalingMode (to match the other enums).
• Renamed RecordingVideoRateControlMode -> RecordingRateControlMode, as this also can apply to audio codecs.
• Added ABR (average bitrate) mode to RecordingRateControlMode.

IRecordingScreenSettings:

• Added audioRateControlMode.
• Added videoScalingMode.

ISystemProperties:

• Renamed supportedRecordingVSMethods to supportedRecordingVSModes (to match RecordingVideoScalingMode).
• Added supportedRecordingARCModes.

Renamed com::settings::RecordingScreenSettings.Audio.enmAudioCodec -> .enmCodec (Doppelmoppel).

More documentation.

​bugref:10275

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (11 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3019 +3019 @@
     Video.enmCodec       = RecordingVideoCodec_VP8;
     Video.enmDeadline    = RecordingCodecDeadline_Default;
+    Video.enmRateCtlMode = RecordingRateControlMode_VBR;
+    Video.enmScalingMode = RecordingVideoScalingMode_None;
     Video.ulWidth        = 1024;
     Video.ulHeight       = 768;
     Video.ulRate         = 512;
     Video.ulFPS          = 25;
-    Audio.enmAudioCodec  = RecordingAudioCodec_Opus;
+    Audio.enmCodec       = RecordingAudioCodec_Opus;
     Audio.enmDeadline    = RecordingCodecDeadline_Default;
+    Audio.enmRateCtlMode = RecordingRateControlMode_VBR;
     Audio.cBits          = 16;
     Audio.cChannels      = 2;
@@ -3052 +3055 @@
            && Video.enmCodec                                  == RecordingVideoCodec_VP8
            && Video.enmDeadline                               == RecordingCodecDeadline_Default
+           && Video.enmRateCtlMode                            == RecordingRateControlMode_VBR
+           && Video.enmScalingMode                            == RecordingVideoScalingMode_None
            && Video.ulWidth                                   == 1024
            && Video.ulHeight                                  == 768
            && Video.ulRate                                    == 512
            && Video.ulFPS                                     == 25
-           && Audio.enmAudioCodec                             == RecordingAudioCodec_Opus
+           && Audio.enmCodec                                  == RecordingAudioCodec_Opus
            && Audio.enmDeadline                               == RecordingCodecDeadline_Default
+           && Audio.enmRateCtlMode                            == RecordingRateControlMode_VBR
            && Audio.cBits                                     == 16
            && Audio.cChannels                                 == 2
@@ -3100 +3106 @@
            && Video.ulRate        == d.Video.ulRate
            && Video.ulFPS         == d.Video.ulFPS
-           && Audio.enmAudioCodec == d.Audio.enmAudioCodec
+           && Audio.enmCodec      == d.Audio.enmCodec
            && Audio.enmDeadline   == d.Audio.enmDeadline
            && Audio.cBits         == d.Audio.cBits
@@ -6252 +6258 @@
 
             (*itScreen)->getAttributeValue("enabled",   screenSettings.fEnabled);
-            Utf8Str strFeatures;
-            (*itScreen)->getAttributeValue("featuresEnabled", strFeatures);
-            RecordingScreenSettings::featuresFromString(strFeatures, screenSettings.featureMap);
+            Utf8Str strTemp;
+            (*itScreen)->getAttributeValue("featuresEnabled", strTemp);
+            RecordingScreenSettings::featuresFromString(strTemp, screenSettings.featureMap);
             (*itScreen)->getAttributeValue("maxTimeS",  screenSettings.ulMaxTimeS);
             (*itScreen)->getAttributeValue("options",   screenSettings.strOptions);
@@ -6264 +6270 @@
                                       N_("Not supported Recording/@dest attribute '%#x'"), screenSettings.enmDest);
             (*itScreen)->getAttributeValue("maxSizeMB", screenSettings.File.ulMaxSizeMB);
-
+            if ((*itScreen)->getAttributeValue("videoCodec", strTemp)) /* Stick with default if not set. */
+                RecordingScreenSettings::videoCodecFromString(strTemp, screenSettings.Video.enmCodec);
+            (*itScreen)->getAttributeValue("videoScalingMode", (uint32_t &)screenSettings.Video.enmScalingMode);
             (*itScreen)->getAttributeValue("videoDeadline", (uint32_t &)screenSettings.Video.enmDeadline);
             (*itScreen)->getAttributeValue("horzRes",       screenSettings.Video.ulWidth);
@@ -6271 +6279 @@
             (*itScreen)->getAttributeValue("fps",           screenSettings.Video.ulFPS);
 
+            if ((*itScreen)->getAttributeValue("audioCodec", strTemp)) /* Stick with default if not set. */
+                RecordingScreenSettings::audioCodecFromString(strTemp, screenSettings.Audio.enmCodec);
             (*itScreen)->getAttributeValue("audioDeadline", (uint32_t &)screenSettings.Audio.enmDeadline);
             (*itScreen)->getAttributeValue("audioHz",       (uint32_t &)screenSettings.Audio.uHz);
@@ -8286 +8296 @@
         xml::ElementNode *pelmRecording = elmParent.createChild("Recording");
 
-        if (recordingSettings.common.fEnabled)
+        if (!recordingSettings.common.areDefaultSettings())
+        {
             pelmRecording->setAttribute("enabled", recording.common.fEnabled);
+        }
 
         /* Only serialize screens which have non-default settings. */
@@ -8312 +8324 @@
                 pelmScreen->setAttribute("id",                  itScreen->first); /* The key equals the monitor ID. */
                 pelmScreen->setAttribute("enabled",             itScreen->second.fEnabled);
-                com::Utf8Str strFeatures;
-                RecordingScreenSettings::featuresToString(itScreen->second.featureMap, strFeatures);
-                pelmScreen->setAttribute("featuresEnabled",     strFeatures);
+                com::Utf8Str strTemp;
+                RecordingScreenSettings::featuresToString(itScreen->second.featureMap, strTemp);
+                pelmScreen->setAttribute("featuresEnabled",     strTemp);
                 if (itScreen->second.ulMaxTimeS)
                     pelmScreen->setAttribute("maxTimeS",        itScreen->second.ulMaxTimeS);
@@ -8325 +8337 @@
                     pelmScreen->setAttribute("maxSizeMB",       itScreen->second.File.ulMaxSizeMB);
 
+                RecordingScreenSettings::videoCodecToString(itScreen->second.Video.enmCodec, strTemp);
+                pelmScreen->setAttribute("videoCodec",          strTemp);
                 if (itScreen->second.Video.enmDeadline != RecordingCodecDeadline_Default)
                     pelmScreen->setAttribute("videoDeadline",   itScreen->second.Video.enmDeadline);
+                if (itScreen->second.Video.enmScalingMode != RecordingVideoScalingMode_None)
+                    pelmScreen->setAttribute("videoScalingMode",itScreen->second.Video.enmScalingMode);
                 if (   itScreen->second.Video.ulWidth  != 1024
                     || itScreen->second.Video.ulHeight != 768)
@@ -8338 +8354 @@
                     pelmScreen->setAttribute("fps",             itScreen->second.Video.ulFPS);
 
+                RecordingScreenSettings::audioCodecToString(itScreen->second.Audio.enmCodec, strTemp);
+                pelmScreen->setAttribute("audioCodec",          strTemp);
                 if (itScreen->second.Audio.enmDeadline != RecordingCodecDeadline_Default)
                     pelmScreen->setAttribute("audioDeadline",   itScreen->second.Audio.enmDeadline);
@@ -8356 +8374 @@
         xml::ElementNode *pelmVideoCapture = elmParent.createChild("VideoCapture");
 
-        if (recording.common.fEnabled)
+        if (!recordingSettings.common.areDefaultSettings())
+        {
             pelmVideoCapture->setAttribute("enabled", recording.common.fEnabled);
+        }
 
         /* Convert the enabled screens to the former uint64_t bit array and vice versa. */