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

Timestamp:

Aug 19, 2022 7:45:57 AM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Optimization: Check if recording stream updates are needed at display implementation level already, should save quite a few unnecessary calls. bugref:10275

Location:

trunk/src/VBox/Main

Files:

• include/Recording.h (modified) (1 diff)
• include/RecordingInternals.h (modified) (1 diff)
• include/RecordingStream.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (1 diff)
• src-client/Recording.cpp (modified) (1 diff)
• src-client/RecordingCodec.cpp (modified) (2 diffs)
• src-client/RecordingStream.cpp (modified) (4 diffs)

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

@@ -70 +70 @@
     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 rc);

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

@@ -454 +454 @@
 int recordingCodecEncode(PRECORDINGCODEC pCodec, const PRECORDINGFRAME pFrame, size_t *pcEncoded, size_t *pcbEncoded);
 int recordingCodecFinalize(PRECORDINGCODEC pCodec);
-uint32_t recordingCodecGetWritable(PRECORDINGCODEC pCodec, uint64_t msTimestamp);
+bool recordingCodecIsInitialized(const PRECORDINGCODEC pCodec);
+uint32_t recordingCodecGetWritable(const PRECORDINGCODEC pCodec, uint64_t msTimestamp);
 #endif /* !MAIN_INCLUDED_RecordingInternals_h */

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

@@ -130 +130 @@
 #endif
     PRECORDINGCODEC GetVideoCodec(void) { return &this->CodecVideo; };
+
     bool IsLimitReached(uint64_t msTimestamp) const;
     bool IsReady(void) const;
+    bool NeedsUpdate(uint64_t msTimestamp) const;
 
 public:

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

@@ -2994 +2994 @@
             {
                 if (!pDisplay->maRecordingEnabled[uScreenId])
+                    continue;
+
+                if (!pCtx->NeedsUpdate(uScreenId, tsNowMs))
                     continue;
 

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

@@ -810 +810 @@
 
     return fLimitReached;
+}
+
+/**
+ * Returns if a specific screen needs to be fed with an update or not.
+ *
+ * @returns @c true if an update is needed, @c false if not.
+ * @param   uScreen             Screen ID to retrieve update stats for.
+ * @param   msTimestamp         Timestamp (PTS, in ms).
+ */
+bool RecordingContext::NeedsUpdate( uint32_t uScreen, uint64_t msTimestamp)
+{
+    lock();
+
+    bool fNeedsUpdate = false;
+
+    if (this->enmState == RECORDINGSTS_STARTED)
+    {
+        if (   recordingCodecIsInitialized(&CodecAudio)
+            && recordingCodecGetWritable(&CodecAudio, msTimestamp) > 0)
+        {
+            fNeedsUpdate = true;
+        }
+
+        if (!fNeedsUpdate)
+        {
+            const RecordingStream *pStream = getStreamInternal(uScreen);
+            if (pStream)
+                fNeedsUpdate = pStream->NeedsUpdate(msTimestamp);
+        }
+    }
+
+    unlock();
+
+    return fNeedsUpdate;
 }
 

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

@@ -852 +852 @@
 
 /**
+ * Returns whether the codec has been initialized or not.
+ *
+ * @returns \c true if initialized, or \c false if not.
+ * @param   pCodec              Codec to return initialization status for.
+ */
+bool recordingCodecIsInitialized(const PRECORDINGCODEC pCodec)
+{
+    return pCodec->Ops.pfnInit != NULL; /* pfnInit acts as a beacon for initialization status. */
+}
+
+/**
  * Returns the number of writable bytes for a given timestamp.
  *
@@ -860 +871 @@
  * @param   msTimestamp         Timestamp (PTS, in ms) return number of writable bytes for.
  */
-uint32_t recordingCodecGetWritable(PRECORDINGCODEC pCodec, uint64_t msTimestamp)
+uint32_t recordingCodecGetWritable(const PRECORDINGCODEC pCodec, uint64_t msTimestamp)
 {
     Log3Func(("%RU64 -- tsLastWrittenMs=%RU64 + uDelayMs=%RU32\n",

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

@@ -283 +283 @@
 
 /**
+ * Returns if a recording stream needs to be fed with an update or not.
+ *
+ * @returns @c true if an update is needed, @c false if not.
+ * @param   msTimestamp         Timestamp (PTS, in ms).
+ */
+bool RecordingStream::NeedsUpdate(uint64_t msTimestamp) const
+{
+    return recordingCodecGetWritable((const PRECORDINGCODEC)&CodecVideo, msTimestamp) > 0;
+}
+
+/**
  * Processes a recording stream.
  * This function takes care of the actual encoding and writing of a certain stream.
@@ -432 +443 @@
 {
     AssertPtrReturn(m_pCtx, VERR_WRONG_ORDER);
+    AssertReturn(NeedsUpdate(msTimestamp), VINF_RECORDING_THROTTLED); /* We ASSUME that the caller checked that first. */
 
     Log3Func(("cbData=%zu, msTimestamp=%RU64\n", cbData, msTimestamp));
@@ -459 +471 @@
                                     uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData, uint64_t msTimestamp)
 {
+    AssertPtrReturn(m_pCtx, VERR_WRONG_ORDER);
+    AssertReturn(NeedsUpdate(msTimestamp), VINF_RECORDING_THROTTLED); /* We ASSUME that the caller checked that first. */
+
     lock();
 
     Log3Func(("[%RU32 %RU32 %RU32 %RU32] msTimestamp=%RU64\n", x , y, uSrcWidth, uSrcHeight, msTimestamp));
-
-    PRECORDINGCODEC pCodec = &this->CodecVideo;
 
     PRECORDINGVIDEOFRAME pFrame = NULL;
@@ -476 +489 @@
     do
     {
-        if (recordingCodecGetWritable(pCodec, msTimestamp) == 0)
-        {
-            vrc = VINF_RECORDING_THROTTLED; /* Respect maximum frames per second (FPS). */
-            break;
-        }
-
         int xDiff = ((int)this->ScreenSettings.Video.ulWidth - (int)uSrcWidth) / 2;
         uint32_t w = uSrcWidth;