Changeset 105095 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 2, 2024 10:06:48 AM (7 months ago)

Author:

vboxsync

Message:

Video Recording/Main: More optimizations for recording older guests which have a slightly different screen update logic. bugref:10650

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• DisplayImpl.h (modified) (3 diffs)
• Recording.h (modified) (5 diffs)
• RecordingInternals.h (modified) (2 diffs)
• RecordingStream.h (modified) (1 diff)

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

@@ -205 +205 @@
     int i_recordingStop(util::AutoWriteLock *pAutoLock = NULL);
     int i_recordingCursorShapeChange(bool fVisible, bool fAlpha, uint32_t xHot, uint32_t yHot, uint32_t uWidth, uint32_t uHeight, const uint8_t *pu8Shape, uint32_t cbShape);
+    static DECLCALLBACK(void) s_recordingOnStateChangedCallback(RecordingContext *pCtx, RECORDINGSTS enmSts, uint32_t uScreen, int vrc, void *pvUser);
 # ifdef VBOX_WITH_AUDIO_RECORDING
     AudioVideoRec *i_recordingGetAudioDrv(void) const { return mRecording.mAudioRec; }

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

@@ -46 +46 @@
 #ifdef VBOX_WITH_RECORDING
 # include "RecordingInternals.h"
+class RecordingContext;
 #endif
 
@@ -188 +189 @@
     int i_recordingStart(void);
     int i_recordingStop(void);
-    int i_recordingInvalidate(bool fForce = false);
+    int i_recordingInvalidate(void);
     int i_recordingScreenChanged(unsigned uScreenId, const DISPLAYFBINFO *pFBInfo);
-    int i_recordingScreenUpdate(unsigned uScreenId, PRECORDINGVIDEOFRAME pFrame);
+    int i_recordingScreenUpdate(unsigned uScreenId, uint8_t *pauFramebuffer, size_t cbFramebuffer, uint32_t x, uint32_t y, uint32_t w, uint32_t h, uint32_t uBytesPerLine);
+    int i_recordingScreenUpdate(unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
     int i_recordingCursorPositionChange(unsigned uScreenId, uint32_t fFlags, int32_t x, int32_t y);
 #endif
@@ -414 +416 @@
 
 #ifdef VBOX_WITH_RECORDING
-    /* Serializes access to video recording source bitmaps. */
-    RTCRITSECT           mVideoRecLock;
-    /** Array which defines which screens are being enabled for recording. */
-    bool                 maRecordingEnabled[SchemaDefs::MaxGuestMonitors];
+    /** Struct which holds information and state about (video) recording. */
+    struct Recording
+    {
+        Recording()
+            : pCtx(NULL) { }
+
+        /** Recording context. Constant across lifetime.
+         *  Might be NULL if not being used. */
+        RecordingContext * const pCtx;
+    } Recording;
 #endif
 
 #ifdef VBOX_WITH_STATISTICS
+    /** Struct for keeping STAM values. */
     struct
     {

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

@@ -71 +71 @@
 
 /**
+ * Enumeration for a recording context state.
+ */
+enum RECORDINGSTS
+{
+    /** Recording not initialized. */
+    RECORDINGSTS_UNINITIALIZED = 0,
+    /** Recording was created. */
+    RECORDINGSTS_CREATED       = 1,
+    /** Recording was started. */
+    RECORDINGSTS_STARTED       = 2,
+    /** Recording was stopped. */
+    RECORDINGSTS_STOPPED       = 3,
+    /** Limit has been reached. */
+    RECORDINGSTS_LIMIT_REACHED = 4,
+    /** Recording experienced an error. */
+    RECORDINGSTS_FAILURE       = 5,
+    /** The usual 32-bit hack. */
+    RECORDINGSTS_32BIT_HACK    = 0x7fffffff
+};
+
+/**
  * Class for managing a recording context.
  */
 class RecordingContext
 {
+    friend RecordingStream;
+
+public:
+
+    /** Recording context callback table. */
+    struct CALLBACKS
+    {
+       /**
+        * Recording state got changed. Optional.
+        *
+        * @param   pCtx                 Recording context.
+        * @param   enmSts               New status.
+        * @param   uScreen              Screen ID.
+        *                               Set to UINT32_MAX if the limit of all streams was reached.
+        * @param   vrc                  Result code of state change.
+        * @param   pvUser               User-supplied pointer. Might be NULL.
+        */
+        DECLCALLBACKMEMBER(void, pfnStateChanged, (RecordingContext *pCtx, RECORDINGSTS enmSts, uint32_t uScreen, int vrc, void *pvUser));
+
+        /** User-supplied pointer. Might be NULL. */
+        void *pvUser;
+    };
+
 public:
 
@@ -108 +152 @@
     uint64_t GetCurrentPTS(void) const;
     bool IsFeatureEnabled(RecordingFeature_T enmFeature);
+    bool IsFeatureEnabled(uint32_t uScreen, RecordingFeature_T enmFeature);
     bool IsReady(void);
-    bool IsReady(uint32_t uScreen, uint64_t msTimestamp);
     bool IsStarted(void);
     bool IsLimitReached(void);
     bool IsLimitReached(uint32_t uScreen, uint64_t msTimestamp);
     bool NeedsUpdate(uint32_t uScreen, uint64_t msTimestamp);
-
-    DECLCALLBACK(int) OnLimitReached(uint32_t uScreen, int vrc);
+    void SetCallbacks(RecordingContext::CALLBACKS *pCallbacks, void *pvUser);
 
     /** The state mouse cursor state.
@@ -138 +181 @@
     int unlock(void);
 
+    int onLimitReached(uint32_t uScreen, int vrc);
+
     static DECLCALLBACK(int) threadMain(RTTHREAD hThreadSelf, void *pvUser);
 
@@ -149 +194 @@
 
 protected:
-
-    /**
-     * Enumeration for a recording context state.
-     */
-    enum RECORDINGSTS
-    {
-        /** Context not initialized. */
-        RECORDINGSTS_UNINITIALIZED = 0,
-        /** Context was created. */
-        RECORDINGSTS_CREATED       = 1,
-        /** Context was started. */
-        RECORDINGSTS_STARTED       = 2,
-        /** The usual 32-bit hack. */
-        RECORDINGSTS_32BIT_HACK    = 0x7fffffff
-    };
 
     /** Pointer to the console object. */
@@ -171 +201 @@
     /** The current state. */
     RECORDINGSTS                 m_enmState;
+    /** Callback table. */
+    CALLBACKS                    m_Callbacks;
     /** Critical section to serialize access. */
     RTCRITSECT                   m_CritSect;

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

@@ -101 +101 @@
     /** Pixel format. */
     RECORDINGPIXELFMT enmPixelFmt;
-    /** Bytes per scan line (stride). */
+    /** Bytes per scan line (stride).
+     *  Note: Does not necessarily match \a uWidth * (\a uBPP / 8). */
     uint32_t          uBytesPerLine;
 } RECORDINGSURFACEINFO;
@@ -539 +540 @@
 PRECORDINGVIDEOFRAME RecordingVideoFrameDup(PRECORDINGVIDEOFRAME pFrame);
 void RecordingVideoFrameClear(PRECORDINGVIDEOFRAME pFrame);
-int RecordingVideoFrameBlitRawAlpha(PRECORDINGVIDEOFRAME pFrame, uint32_t uDstX, uint32_t uDstY, const uint8_t *pu8Src, size_t cbSrc, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight, uint32_t uSrcBytesPerLine, uint8_t uSrcBPP, RECORDINGPIXELFMT enmFmt);
-int RecordingVideoFrameBlitRaw(PRECORDINGVIDEOFRAME pFrame, uint32_t uDstX, uint32_t uDstY, const uint8_t *pu8Src, size_t cbSrc, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight, uint32_t uSrcBytesPerLine, uint8_t uSrcBPP, RECORDINGPIXELFMT enmFmt);
+int RecordingVideoFrameBlitRawAlpha(PRECORDINGVIDEOFRAME pDstFrame, uint32_t uDstX, uint32_t uDstY, const uint8_t *pu8Src, size_t cbSrc, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight, uint32_t uSrcBytesPerLine, uint8_t uSrcBPP, RECORDINGPIXELFMT enmFmt);
+int RecordingVideoBlitRaw(uint8_t *pu8Dst, size_t cbDst, uint32_t uDstX, uint32_t uDstY, uint32_t uDstBytesPerLine, uint8_t uDstBPP, RECORDINGPIXELFMT enmDstFmt, const uint8_t *pu8Src, size_t cbSrc, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight, uint32_t uSrcBytesPerLine, uint8_t uSrcBPP, RECORDINGPIXELFMT enmSrcFmt);
+int RecordingVideoFrameBlitRaw(PRECORDINGVIDEOFRAME pDstFrame, uint32_t uDstX, uint32_t uDstY, const uint8_t *pu8Src, size_t cbSrc, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight, uint32_t uSrcBytesPerLine, uint8_t uSrcBPP, RECORDINGPIXELFMT enmFmt);
 int RecordingVideoFrameBlitFrame(PRECORDINGVIDEOFRAME pDstFrame, uint32_t uDstX, uint32_t uDstY, PRECORDINGVIDEOFRAME pSrcFrame, uint32_t uSrcX, uint32_t uSrcY, uint32_t uSrcWidth, uint32_t uSrcHeight);
 

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

@@ -144 +144 @@
 
     bool IsLimitReached(uint64_t msTimestamp) const;
-    bool IsReady(void) const;
+    bool IsFeatureEnabled(RecordingFeature_T enmFeature) const;
     bool NeedsUpdate(uint64_t msTimestamp) const;