Changeset 96142 in vbox

Timestamp:

Aug 11, 2022 4:14:23 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.

​(Build fix, forgot to commit a file) bugref:10275

File:

• trunk/src/VBox/Main/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -140 +140 @@
 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
 VBOX_MAIN_DEFS += VBOX_WITH_PDM_ASYNC_COMPLETION
-endif
-ifdef VBOX_WITH_RECORDING
-VBOX_MAIN_DEFS += VBOX_WITH_RECORDING
 endif
 ifdef VBOX_WITH_SDS
@@ -1004 +1001 @@
 VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB
 
-if defined(VBOX_WITH_RECORDING) && defined(VBOX_WITH_LIBVPX)
-VBoxC_SDKS += VBOX_VPX
-VBoxC_DEFS += VBOX_WITH_LIBVPX
-VBoxC_SOURCES += \
+ifdef VBOX_WITH_RECORDING
+ VBoxC_DEFS  += VBOX_WITH_RECORDING
+ # Needed in VBoxSVC for ISystemProperties.
+ src-server/SystemPropertiesImpl.cpp_DEFS += VBOX_WITH_RECORDING
+ ifdef VBOX_WITH_LIBVPX
+  VBoxC_SDKS += VBOX_VPX
+  VBoxC_DEFS += VBOX_WITH_LIBVPX
+ endif
+ VBoxC_SOURCES += \
         src-client/EBMLWriter.cpp \
         src-client/WebMWriter.cpp \
@@ -1015 +1017 @@
         src-client/RecordingUtils.cpp
 
- if defined(VBOX_WITH_AUDIO_RECORDING) && defined(VBOX_WITH_LIBOPUS)
-VBoxC_SDKS += VBOX_OPUS
-VBoxC_DEFS += VBOX_WITH_AUDIO_RECORDING VBOX_WITH_LIBOPUS
-VBoxC_SOURCES += src-client/DrvAudioRec.cpp
- endif
-endif # VBOX_WITH_RECORDING && VBOX_WITH_LIBVPX
+ ifdef VBOX_WITH_AUDIO_RECORDING
+  VBoxC_DEFS += VBOX_WITH_AUDIO_RECORDING
+  # Needed in VBoxSVC for ISystemProperties.
+  src-server/SystemPropertiesImpl.cpp_DEFS += VBOX_WITH_AUDIO_RECORDING
+  ifdef VBOX_WITH_LIBOPUS
+   VBoxC_SDKS += VBOX_OPUS
+   VBoxC_DEFS += VBOX_WITH_LIBOPUS
+   # Needed in VBoxSVC for ISystemProperties.
+   src-server/SystemPropertiesImpl.cpp_DEFS += VBOX_WITH_LIBOPUS
+  endif
+  VBoxC_SOURCES += src-client/DrvAudioRec.cpp
+ endif # VBOX_WITH_AUDIO_RECORDING
+endif # VBOX_WITH_RECORDING
 
 ifdef VBOX_WITH_OPENSSL_FIPS
@@ -1234 +1243 @@
  VBoxClient-x86_SDKS = $(filter-out VBOX_OPUS VBOX_VPX,$(VBoxC_SDKS))
  VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT \
-        $(filter-out VBOX_WITH_RECORDING VBOX_WITH_LIBVPX VBOX_WITH_AUDIO_RECORDING VBOX_WITH_LIBOPUS,$(VBoxC_DEFS))
+        $(filter-out VBOX_WITH_RECORDING VBOX_WITH_AUDIO_RECORDING \
+                 VBOX_WITH_LIBVPX VBOX_WITH_LIBOPUS,$(VBoxC_DEFS))
  VBoxClient-x86_INCS.win = \
         $(VBoxClient-x86_0_OUTDIR) \