Changeset 96179 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 12, 2022 2:43:31 PM (2 years ago)

Author:

vboxsync

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 [build fix]. bugref:10275

Location:

trunk/src/VBox/Main

Files:

• include/RecordingStream.h (modified) (1 diff)
• src-client/RecordingCodec.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/RecordingStream.h

@@ -134 +134 @@
 protected:
 
-    static int codecWriteDataCallback(PRECORDINGCODEC pCodec, const void *pvData, size_t cbData, void *pvUser);
+    static DECLCALLBACK(int) codecWriteDataCallback(PRECORDINGCODEC pCodec, const void *pvData, size_t cbData, void *pvUser);
 
 protected:

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

@@ -19 +19 @@
 #include "LoggingNew.h"
 
+#include <VBox/com/string.h>
 #include <VBox/err.h>
 #include <VBox/vmm/pdmaudioifs.h>
@@ -100 +101 @@
 
 /** @copydoc RECORDINGCODECOPS::pfnParseOptions */
-static DECLCALLBACK(int) recordingCodecVPXParseOptions(PRECORDINGCODEC pCodec, const Utf8Str &strOptions)
+static DECLCALLBACK(int) recordingCodecVPXParseOptions(PRECORDINGCODEC pCodec, const com::Utf8Str &strOptions)
 {
     size_t pos = 0;
@@ -548 +549 @@
     AssertReturn(pCodec->Parms.enmType == RECORDINGCODECTYPE_AUDIO, VERR_INVALID_PARAMETER);
 
-    Utf8Str strCodec;
+    com::Utf8Str strCodec;
     settings::RecordingScreenSettings::audioCodecToString(pCodec->Parms.enmAudioCodec, strCodec);
     LogRel(("Recording: Initializing audio codec '%s'\n", strCodec.c_str()));
@@ -606 +607 @@
                                    const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreenSettings &Settings)
 {
-    Utf8Str strTemp;
+    com::Utf8Str strTemp;
     settings::RecordingScreenSettings::videoCodecToString(pCodec->Parms.enmVideoCodec, strTemp);
     LogRel(("Recording: Initializing video codec '%s'\n", strTemp.c_str()));
@@ -654 +655 @@
  * @param   strOptions          Options string to parse.
  */
-static DECLCALLBACK(int) recordingCodecAudioParseOptions(PRECORDINGCODEC pCodec, const Utf8Str &strOptions)
+static DECLCALLBACK(int) recordingCodecAudioParseOptions(PRECORDINGCODEC pCodec, const com::Utf8Str &strOptions)
 {
     AssertReturn(pCodec->Parms.enmType == RECORDINGCODECTYPE_AUDIO, VERR_INVALID_PARAMETER);