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

Timestamp:

Aug 12, 2022 2:01:17 PM (3 years ago)

Author:

vboxsync

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

152983

Message:

Recording: Implemented support for Vorbis codec (provided by libvorbis, not enabled by default yet). This also makes all the codec handling more abstract by using a simple codec wrapper, to keep other places free from codec-specific as much as possible. Initial implementation works and output files are being recognized by media players, but there still are some timing bugs to resolve, as well as optimizing the performance. bugref:10275

File:

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

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

@@ -3025 +3025 @@
     Video.ulRate         = 512;
     Video.ulFPS          = 25;
+#ifdef VBOX_WITH_AUDIO_RECORDING
+    /* When both codecs are defined, prefer Ogg Vorbis as a default. */
+# if   defined(VBOX_WITH_LIBVORBIS)
+    Audio.enmCodec       = RecordingAudioCodec_OggVorbis;
+# elif defined(VBOX_WITH_LIBOPUS)
     Audio.enmCodec       = RecordingAudioCodec_Opus;
+# else
+    Audio.enmCodec       = RecordingAudioCodec_None;
+# endif
+#else
+    Audio.enmCodec       = RecordingAudioCodec_None;
+#endif /* VBOX_WITH_RECORDING */
     Audio.enmDeadline    = RecordingCodecDeadline_Default;
     Audio.enmRateCtlMode = RecordingRateControlMode_VBR;
@@ -3061 +3072 @@
            && Video.ulRate                                    == 512
            && Video.ulFPS                                     == 25
+#ifdef VBOX_WITH_AUDIO_RECORDING
+/* When both codecs are defined, prefer Ogg Vorbis as a default. */
+# if   defined(VBOX_WITH_LIBVORBIS)
+           && Audio.enmCodec                                  == RecordingAudioCodec_OggVorbis
+# elif defined(VBOX_WITH_LIBOPUS)
            && Audio.enmCodec                                  == RecordingAudioCodec_Opus
+# else
+           && Audio.enmCodec                                  == RecordingAudioCodec_None
+# endif
+#else
+           && Audio.enmCodec                                  == RecordingAudioCodec_None
+#endif /* VBOX_WITH_AUDIO_RECORDING */
            && Audio.enmDeadline                               == RecordingCodecDeadline_Default
            && Audio.enmRateCtlMode                            == RecordingRateControlMode_VBR
@@ -3093 +3115 @@
 bool RecordingScreenSettings::operator==(const RecordingScreenSettings &d) const
 {
-    return    fEnabled            == d.fEnabled
-           && enmDest             == d.enmDest
-           && featureMap          == d.featureMap
-           && ulMaxTimeS          == d.ulMaxTimeS
-           && strOptions          == d.strOptions
-           && File.strName        == d.File.strName
-           && File.ulMaxSizeMB    == d.File.ulMaxSizeMB
-           && Video.enmDeadline   == d.Video.enmDeadline
-           && Video.enmCodec      == d.Video.enmCodec
-           && Video.ulWidth       == d.Video.ulWidth
-           && Video.ulHeight      == d.Video.ulHeight
-           && Video.ulRate        == d.Video.ulRate
-           && Video.ulFPS         == d.Video.ulFPS
-           && Audio.enmCodec      == d.Audio.enmCodec
-           && Audio.enmDeadline   == d.Audio.enmDeadline
-           && Audio.cBits         == d.Audio.cBits
-           && Audio.cChannels     == d.Audio.cChannels
-           && Audio.uHz           == d.Audio.uHz
-           && featureMap          == d.featureMap;
+    return    fEnabled             == d.fEnabled
+           && enmDest              == d.enmDest
+           && featureMap           == d.featureMap
+           && ulMaxTimeS           == d.ulMaxTimeS
+           && strOptions           == d.strOptions
+           && File.strName         == d.File.strName
+           && File.ulMaxSizeMB     == d.File.ulMaxSizeMB
+           && Video.enmCodec       == d.Video.enmCodec
+           && Video.enmDeadline    == d.Video.enmDeadline
+           && Video.enmRateCtlMode == d.Video.enmRateCtlMode
+           && Video.enmScalingMode == d.Video.enmScalingMode
+           && Video.ulWidth        == d.Video.ulWidth
+           && Video.ulHeight       == d.Video.ulHeight
+           && Video.ulRate         == d.Video.ulRate
+           && Video.ulFPS          == d.Video.ulFPS
+           && Audio.enmCodec       == d.Audio.enmCodec
+           && Audio.enmDeadline    == d.Audio.enmDeadline
+           && Audio.enmRateCtlMode == d.Audio.enmRateCtlMode
+           && Audio.cBits          == d.Audio.cBits
+           && Audio.cChannels      == d.Audio.cChannels
+           && Audio.uHz            == d.Audio.uHz
+           && featureMap           == d.featureMap;
 }
 
@@ -6272 +6297 @@
             if ((*itScreen)->getAttributeValue("videoCodec", strTemp)) /* Stick with default if not set. */
                 RecordingScreenSettings::videoCodecFromString(strTemp, screenSettings.Video.enmCodec);
+            (*itScreen)->getAttributeValue("videoDeadline", (uint32_t &)screenSettings.Video.enmDeadline);
+            (*itScreen)->getAttributeValue("videoRateCtlMode", (uint32_t &)screenSettings.Video.enmRateCtlMode);
             (*itScreen)->getAttributeValue("videoScalingMode", (uint32_t &)screenSettings.Video.enmScalingMode);
-            (*itScreen)->getAttributeValue("videoDeadline", (uint32_t &)screenSettings.Video.enmDeadline);
             (*itScreen)->getAttributeValue("horzRes",       screenSettings.Video.ulWidth);
             (*itScreen)->getAttributeValue("vertRes",       screenSettings.Video.ulHeight);
@@ -6282 +6308 @@
                 RecordingScreenSettings::audioCodecFromString(strTemp, screenSettings.Audio.enmCodec);
             (*itScreen)->getAttributeValue("audioDeadline", (uint32_t &)screenSettings.Audio.enmDeadline);
+            (*itScreen)->getAttributeValue("audioRateCtlMode", (uint32_t &)screenSettings.Audio.enmRateCtlMode);
             (*itScreen)->getAttributeValue("audioHz",       (uint32_t &)screenSettings.Audio.uHz);
             (*itScreen)->getAttributeValue("audioBits",     (uint32_t &)screenSettings.Audio.cBits);
@@ -8341 +8368 @@
                 if (itScreen->second.Video.enmDeadline != RecordingCodecDeadline_Default)
                     pelmScreen->setAttribute("videoDeadline",   itScreen->second.Video.enmDeadline);
+                if (itScreen->second.Video.enmRateCtlMode != RecordingRateControlMode_VBR) /* Is default. */
+                    pelmScreen->setAttribute("videoRateCtlMode", itScreen->second.Video.enmRateCtlMode);
                 if (itScreen->second.Video.enmScalingMode != RecordingVideoScalingMode_None)
                     pelmScreen->setAttribute("videoScalingMode",itScreen->second.Video.enmScalingMode);
@@ -8358 +8387 @@
                 if (itScreen->second.Audio.enmDeadline != RecordingCodecDeadline_Default)
                     pelmScreen->setAttribute("audioDeadline",   itScreen->second.Audio.enmDeadline);
+                if (itScreen->second.Audio.enmRateCtlMode != RecordingRateControlMode_VBR) /* Is default. */
+                    pelmScreen->setAttribute("audioRateCtlMode", itScreen->second.Audio.enmRateCtlMode);
                 if (itScreen->second.Audio.uHz != 22050)
                     pelmScreen->setAttribute("audioHz",         itScreen->second.Audio.uHz);