Changeset 96229 in vbox for trunk/src/VBox/Main/include/RecordingStream.h

Timestamp:

Aug 16, 2022 3:41:39 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Decoupled the WebM writer class from codec dependencies. Various bugfixes. bugref:10275

File:

• trunk/src/VBox/Main/include/RecordingStream.h (modified) (4 diffs)

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

@@ -126 +126 @@
     uint16_t GetID(void) const { return this->uScreenID; };
 #ifdef VBOX_WITH_AUDIO_RECORDING
-    PRECORDINGCODEC GetAudioCodec(void) { return &this->CodecAudio; };
+    PRECORDINGCODEC GetAudioCodec(void) { return this->pCodecAudio; };
 #endif
     PRECORDINGCODEC GetVideoCodec(void) { return &this->CodecVideo; };
@@ -132 +132 @@
     bool IsReady(void) const;
 
+public:
+
+    static DECLCALLBACK(int) codecWriteDataCallback(PRECORDINGCODEC pCodec, const void *pvData, size_t cbData, uint64_t msAbsPTS, uint32_t uFlags, void *pvUser);
+
 protected:
 
-    static DECLCALLBACK(int) codecWriteDataCallback(PRECORDINGCODEC pCodec, const void *pvData, size_t cbData, void *pvUser);
-
-protected:
-
-    int open(const settings::RecordingScreenSettings &Settings);
+    int open(const settings::RecordingScreenSettings &screenSettings);
     int close(void);
 
-    int initInternal(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings);
+    int initInternal(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &screenSettings);
     int uninitInternal(void);
 
-    int initVideo(const settings::RecordingScreenSettings &Settings);
+    int initVideo(const settings::RecordingScreenSettings &screenSettings);
     int unitVideo(void);
-
-    int initAudio(const settings::RecordingScreenSettings &Settings);
 
     bool isLimitReachedInternal(uint64_t msTimestamp) const;
     int iterateInternal(uint64_t msTimestamp);
+
+    int codecWriteToWebM(PRECORDINGCODEC pCodec, const void *pvData, size_t cbData, uint64_t msAbsPTS, uint32_t uFlags);
 
     void lock(void);
@@ -171 +171 @@
 
     /** Recording context this stream is associated to. */
-    RecordingContext       *pCtx;
+    RecordingContext       *m_pCtx;
     /** The current state. */
     RECORDINGSTREAMSTATE    enmState;
@@ -192 +192 @@
     /** Critical section to serialize access. */
     RTCRITSECT          CritSect;
-    /** Timestamp (in ms) of when recording has been start. */
+    /** Timestamp (in ms) of when recording has been started. */
     uint64_t            tsStartMs;
-
-    /** Audio codec instance data to use. */
-    RECORDINGCODEC                    CodecAudio;
+#ifdef VBOX_WITH_AUDIO_RECORDING
+    /** Pointer to audio codec instance data to use.
+     *
+     *  We multiplex audio data from the recording context to all streams,
+     *  to avoid encoding the same audio data for each stream. We ASSUME that
+     *  all audio data of a VM will be the same for each stream at a given
+     *  point in time.
+     *
+     *  Might be NULL if not being used. */
+    PRECORDINGCODEC     pCodecAudio;
+#endif /* VBOX_WITH_AUDIO_RECORDING */
     /** Video codec instance data to use. */
-    RECORDINGCODEC                    CodecVideo;
+    RECORDINGCODEC      CodecVideo;
     /** Screen settings to use. */
-    settings::RecordingScreenSettings ScreenSettings;
+    settings::RecordingScreenSettings
+                        ScreenSettings;
     /** Common set of recording (data) blocks, needed for
      *  multiplexing to all recording streams. */
-    RecordingBlockSet                 Blocks;
+    RecordingBlockSet   Blocks;
 };