Changeset 42913 in vbox for trunk/src/VBox

Timestamp:

Aug 22, 2012 8:22:26 AM (12 years ago)

Author:

vboxsync

Message:

Main/VideoRecAndEncode module: removed COMGETTERS from displayrefreshcallback.. Error checking.

File:

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

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

@@ -3284 +3284 @@
     {
         uint32_t u32VideoRecImgFormat = VPX_IMG_FMT_NONE;
+        ULONG ulGuestHeight = 0;
+        ULONG ulGuestWidth = 0;
         DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN];
 
@@ -3297 +3299 @@
             ULONG ulBitsPerPixel;
             rc = pFBInfo->pFramebuffer->COMGETTER(BitsPerPixel)(&ulBitsPerPixel);
-            AssertComRC(rc);
-
-            ULONG ulGuestHeight = 0;
-            rc = pFBInfo->pFramebuffer->COMGETTER(Height)(&ulGuestHeight);
-            AssertComRC(rc);
-
-            ULONG ulGuestWidth = 0;
-            rc = pFBInfo->pFramebuffer->COMGETTER(Width)(&ulGuestWidth);
-            AssertComRC(rc);
-
-            BYTE *address = NULL;
-            rc = pFBInfo->pFramebuffer->COMGETTER(Address)(&address);
-            AssertComRC(rc);
-
-            ULONG ulBytesPerLine = 0;
-            rc = pFBInfo->pFramebuffer->COMGETTER(BytesPerLine)(&ulBytesPerLine);
             AssertComRC(rc);
 
@@ -3337 +3323 @@
             }
 
-            if (   u32VideoRecImgFormat != VPX_IMG_FMT_NONE
-                && address)
+            if (u32VideoRecImgFormat != VPX_IMG_FMT_NONE)
             {
-                VideoRecCopyToIntBuffer(pDisplay->mpVideoRecContext, pFBInfo->xOrigin, pFBInfo->yOrigin,
-                                        ulPixelFormat, ulBitsPerPixel, ulBytesPerLine,
-                                        ulGuestWidth, ulGuestHeight, address);
-
-                VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat);
-                VideoRecEncodeAndWrite(pDisplay->mpVideoRecContext, ulGuestWidth, ulGuestHeight);
+                if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM)
+                {
+                    rc = VideoRecCopyToIntBuffer(pDisplay->mpVideoRecContext, 0, 0,
+                                            ulPixelFormat, pFBInfo->u16BitsPerPixel, pFBInfo->u32LineSize,
+                                            pFBInfo->w, pFBInfo->h, pFBInfo->pu8FramebufferVRAM);
+                    ulGuestWidth = pFBInfo->w;
+                    ulGuestHeight = pFBInfo->h;
+                }
+                else
+                {
+                    rc = VideoRecCopyToIntBuffer(pDisplay->mpVideoRecContext, 0, 0,
+                                            ulPixelFormat, pDrv->IConnector.cBits, pDrv->IConnector.cbScanline,
+                                            pDrv->IConnector.cx, pDrv->IConnector.cy, pDrv->IConnector.pu8Data);
+                    ulGuestWidth = pDrv->IConnector.cx;
+                    ulGuestHeight = pDrv->IConnector.cy;
+                }
+
+                /* Just return in case of filure without any assertion */
+                if(rc)
+                    return;
+
+                if (!(VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat)))
+                    VideoRecEncodeAndWrite(pDisplay->mpVideoRecContext, ulGuestWidth, ulGuestHeight);
             }
         }