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

Timestamp:

Jul 4, 2024 9:01:06 AM (7 months ago)

Author:

vboxsync

Message:

Video Recording/Main: Fixed too strict debug assertions. bugref:10650

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (3 diffs)

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

@@ -2333 +2333 @@
 int Display::i_recordingScreenUpdate(unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
+    RecordingContext *pCtx = Recording.pCtx;
+
+    if (!pCtx->IsFeatureEnabled(uScreenId, RecordingFeature_Video))
+        return VINF_SUCCESS;
+
     BYTE *pbAddress;
     ULONG ulWidth;
@@ -2339 +2344 @@
     ULONG ulBytesPerLine;
 
-    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN) /* Take a shortcut for the primary screen. */
+    if (   uScreenId == VBOX_VIDEO_PRIMARY_SCREEN /* Take a shortcut for the primary screen. */
+        && mpDrv)
     {
         pbAddress      = mpDrv->IConnector.pbData;
@@ -2360 +2366 @@
     Log2Func(("uScreenId=%u, pbAddress=%p, ulWidth=%RU32, ulHeight=%RU32, ulBitsPerPixel=%RU32\n",
               uScreenId, pbAddress, ulWidth, ulHeight, ulBitsPerPixel));
-
-    AssertPtr(pbAddress);
-    Assert(ulWidth);
-    Assert(ulHeight);
-    Assert(ulBitsPerPixel);
-    Assert(ulBytesPerLine);
 
     return i_recordingScreenUpdate(uScreenId,