Changeset 104751 in vbox for trunk/src/VBox

Timestamp:

May 22, 2024 9:46:55 AM (7 months ago)

Author:

vboxsync

Message:

Main/Recording: Don't (debug) assert in RecordingStream::SendVideoFrame() when sending a video frame too early or redundantly; just return VINF_RECORDING_THROTTLED. Can happen when debugging VBoxSVC or when invalid settings are being used. bugref:10603

File:

• trunk/src/VBox/Main/src-client/RecordingStream.cpp (modified) (2 diffs)

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

@@ -419 +419 @@
  * Sends a raw (e.g. not yet encoded) video frame to the recording stream.
  *
- * @returns VBox status code. Will return VINF_RECORDING_LIMIT_REACHED if the stream's recording
- *          limit has been reached or VINF_RECORDING_THROTTLED if the frame is too early for the current
- *          FPS setting.
+ * @returns VBox status code.
+ * @retval  VINF_RECORDING_LIMIT_REACHED if the stream's recording limit has been reached.
+ * @retval  VINF_RECORDING_THROTTLED if the frame is too early for the current FPS setting.
  * @param   x                   Upper left (X) coordinate where the video frame starts.
  * @param   y                   Upper left (Y) coordinate where the video frame starts.
@@ -436 +436 @@
 {
     AssertPtrReturn(m_pCtx, VERR_WRONG_ORDER);
-    AssertReturn(NeedsUpdate(msTimestamp), VINF_RECORDING_THROTTLED); /* We ASSUME that the caller checked that first. */
+
+    if RT_UNLIKELY(!NeedsUpdate(msTimestamp))
+        return VINF_RECORDING_THROTTLED;
 
     lock();