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

Timestamp:

Nov 15, 2018 4:12:07 PM (6 years ago)

Author:

vboxsync

Message:

Recording/Main: Implemented better support for recording limits (also now configurable per screen).

Location:

trunk/src/VBox/Main/include

Files:

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

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

@@ -146 +146 @@
     int i_recordingEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock);
     int i_recordingGetSettings(settings::RecordingSettings &Settings);
-    int i_recordingStart(void);
-    int i_recordingStop(void);
+    int i_recordingStart(util::AutoWriteLock *pAutoLock = NULL);
+    int i_recordingStop(util::AutoWriteLock *pAutoLock = NULL);
     AudioVideoRec *i_recordingGetAudioDrv(void) const { return Recording.mAudioRec; }
     RecordingContext *i_recordingGetContext(void) const { return Recording.mpCtx; }
@@ -179 +179 @@
     HRESULT i_onDnDModeChange(DnDMode_T aDnDMode);
     HRESULT i_onVRDEServerChange(BOOL aRestart);
-    HRESULT i_onRecordingChange();
+    HRESULT i_onRecordingChange(BOOL fEnable);
     HRESULT i_onUSBControllerChange();
     HRESULT i_onSharedFolderChange(BOOL aGlobal);
@@ -1042 +1042 @@
 
         /** The recording context. */
-        RecordingContext       *mpCtx;
+        RecordingContext     *mpCtx;
 # ifdef VBOX_WITH_AUDIO_RECORDING
         /** Pointer to capturing audio backend. */

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

@@ -524 +524 @@
     virtual HRESULT i_onStorageDeviceChange(IMediumAttachment * /* mediumAttachment */, BOOL /* remove */,
                                             BOOL /* silent */) { return S_OK; }
-    virtual HRESULT i_onRecordingChange() { return S_OK; }
+    virtual HRESULT i_onRecordingChange(BOOL /* aEnable */) { return S_OK; }
 
     HRESULT i_saveRegistryEntry(settings::MachineRegistryEntry &data);
@@ -1327 +1327 @@
     HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove);
     HRESULT i_onVRDEServerChange(BOOL aRestart);
-    HRESULT i_onRecordingChange();
+    HRESULT i_onRecordingChange(BOOL aEnable);
     HRESULT i_onUSBControllerChange();
     HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice,

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

@@ -39 +39 @@
 public:
 
-    RecordingContext(Console *pConsole);
-
     RecordingContext(Console *pConsole, const settings::RecordingSettings &a_Settings);
 
@@ -64 +62 @@
 public:
 
-    bool IsFeatureEnabled(RecordingFeature_T enmFeature) const;
+    bool IsFeatureEnabled(RecordingFeature_T enmFeature);
     bool IsReady(void) const;
-    bool IsReady(uint32_t uScreen, uint64_t uTimeStampMs) const;
-    bool IsStarted(void) const;
-    bool IsLimitReached(uint32_t uScreen, uint64_t tsNowMs) const;
+    bool IsReady(uint32_t uScreen, uint64_t uTimeStampMs);
+    bool IsStarted(void);
+    bool IsLimitReached(void);
+    bool IsLimitReached(uint32_t uScreen, uint64_t uTimeStampMs);
+
+    DECLCALLBACK(int) OnLimitReached(uint32_t uScreen, int rc);
 
 protected:
@@ -79 +80 @@
 
     RecordingStream *getStreamInternal(unsigned uScreen) const;
+
+    int lock(void);
+    int unlock(void);
 
     static DECLCALLBACK(int) threadMain(RTTHREAD hThreadSelf, void *pvUser);
@@ -102 +106 @@
 
     /** Pointer to the console object. */
-    Console                  *pConsole;
+    Console                     *pConsole;
     /** Used recording configuration. */
     settings::RecordingSettings  Settings;
     /** The current state. */
-    RECORDINGSTS              enmState;
+    RECORDINGSTS                 enmState;
     /** Critical section to serialize access. */
-    RTCRITSECT                CritSect;
+    RTCRITSECT                   CritSect;
     /** Semaphore to signal the encoding worker thread. */
-    RTSEMEVENT                WaitEvent;
+    RTSEMEVENT                   WaitEvent;
     /** Shutdown indicator. */
-    bool                      fShutdown;
+    bool                         fShutdown;
     /** Worker thread. */
-    RTTHREAD                  Thread;
+    RTTHREAD                     Thread;
     /** Vector of current recording streams.
      *  Per VM screen (display) one recording stream is being used. */
-    RecordingStreams          vecStreams;
+    RecordingStreams             vecStreams;
     /** Number of streams in vecStreams which currently are enabled for recording. */
-    uint16_t                  cStreamsEnabled;
+    uint16_t                     cStreamsEnabled;
     /** Timestamp (in ms) of when recording has been started. */
-    uint64_t                  tsStartMs;
+    uint64_t                     tsStartMs;
     /** Block map of common blocks which need to get multiplexed
      *  to all recording streams. This common block maps should help
@@ -129 +133 @@
      *  For now this only affects audio, e.g. all recording streams
      *  need to have the same audio data at a specific point in time. */
-    RecordingBlockMap         mapBlocksCommon;
+    RecordingBlockMap            mapBlocksCommon;
 };
 #endif /* !____H_RECORDING */

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

@@ -48 +48 @@
             /** Pointer to the codec's internal YUV buffer. */
             uint8_t            *pu8YuvBuf;
+            /** The encoder's deadline (in ms).
+             *  The more time the encoder is allowed to spend encoding, the better the encoded
+             *  result, in exchange for higher CPU usage and time spent encoding. */
             unsigned int        uEncoderDeadline;
         } VPX;

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

@@ -126 +126 @@
     const settings::RecordingScreenSettings &GetConfig(void) const;
     uint16_t GetID(void) const { return this->uScreenID; };
-    bool IsLimitReached(uint64_t tsNowMs) const;
+    bool IsLimitReached(uint64_t uTimeStampMs) const;
     bool IsReady(void) const;
 
@@ -141 +141 @@
 
     int initAudio(void);
+
+    bool isLimitReachedInternal(uint64_t uTimeStampMs) const;
+    int iterateInternal(uint64_t uTimeStampMs);
 
 #ifdef VBOX_WITH_LIBVPX

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

@@ -102 +102 @@
     HRESULT onCPUExecutionCapChange(ULONG aExecutionCap);
     HRESULT onVRDEServerChange(BOOL aRestart);
-    HRESULT onRecordingChange();
+    HRESULT onRecordingChange(BOOL aEnable);
     HRESULT onUSBControllerChange();
     HRESULT onSharedFolderChange(BOOL aGlobal);