Changeset 42944 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 23, 2012 11:25:37 AM (12 years ago)

Author:

vboxsync

Message:

Main/VideoRecAndEncode module: Replaced COM error codes with general error code and other code improvements.

File:

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

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

@@ -3286 +3286 @@
         ULONG ulGuestHeight = 0;
         ULONG ulGuestWidth = 0;
+        ULONG ulBitsPerPixel;
+        int rc;
         DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN];
 
@@ -3292 +3294 @@
             && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
         {
-            HRESULT rc;
-            ULONG ulPixelFormat = 0;
-            rc = pFBInfo->pFramebuffer->COMGETTER(PixelFormat)(&ulPixelFormat);
-            AssertComRC(rc);
-
-            ULONG ulBitsPerPixel;
-            rc = pFBInfo->pFramebuffer->COMGETTER(BitsPerPixel)(&ulBitsPerPixel);
-            AssertComRC(rc);
-
-            if (ulPixelFormat == FramebufferPixelFormat_FOURCC_RGB)
+            if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM)
             {
-                switch (ulBitsPerPixel)
-                {
-                    case 32:
-                        u32VideoRecImgFormat = VPX_IMG_FMT_RGB32;
-                        Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB32\n"));
-                        break;
-                    case 24:
-                        u32VideoRecImgFormat = VPX_IMG_FMT_RGB24;
-                        Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB24\n"));
-                        break;
-                    case 16:
-                        u32VideoRecImgFormat = VPX_IMG_FMT_RGB565;
-                        Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB565\n"));
-                        break;
-                    default:
-                        Log2(("No Proper Format detected\n"));
-                        break;
-                }
+                rc = VideoRecCopyToIntBuffer(pDisplay->mpVideoRecContext, 0, 0,
+                                             FramebufferPixelFormat_FOURCC_RGB, pFBInfo->u16BitsPerPixel,
+                                             pFBInfo->u32LineSize, pFBInfo->w, pFBInfo->h,
+                                             pFBInfo->pu8FramebufferVRAM);
+                ulGuestWidth = pFBInfo->w;
+                ulGuestHeight = pFBInfo->h;
+                ulBitsPerPixel = pFBInfo->u16BitsPerPixel;
             }
-
-            if (u32VideoRecImgFormat != VPX_IMG_FMT_NONE)
+            else
             {
-                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;
-                }
+                rc = VideoRecCopyToIntBuffer(pDisplay->mpVideoRecContext, 0, 0,
+                                             FramebufferPixelFormat_FOURCC_RGB, pDrv->IConnector.cBits,
+                                             pDrv->IConnector.cbScanline, pDrv->IConnector.cx,
+                                             pDrv->IConnector.cy, pDrv->IConnector.pu8Data);
+                ulGuestWidth = pDrv->IConnector.cx;
+                ulGuestHeight = pDrv->IConnector.cy;
+                ulBitsPerPixel = pDrv->IConnector.cBits;
+            }
+
+            switch (ulBitsPerPixel)
+            {
+                case 32:
+                    u32VideoRecImgFormat = VPX_IMG_FMT_RGB32;
+                    Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB32\n"));
+                    break;
+                case 24:
+                    u32VideoRecImgFormat = VPX_IMG_FMT_RGB24;
+                    Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB24\n"));
+                    break;
+                case 16:
+                    u32VideoRecImgFormat = VPX_IMG_FMT_RGB565;
+                    Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB565\n"));
+                    break;
+                default:
+                    Log2(("No Proper Format detected\n"));
+                    break;
+            }
 
                 /* Just return in case of filure without any assertion */
-                if(rc)
-                    return;
-
-                if (!(VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat)))
-                    VideoRecEncodeAndWrite(pDisplay->mpVideoRecContext, ulGuestWidth, ulGuestHeight);
-            }
+                if( RT_SUCCESS(rc))
+                    if (RT_SUCCESS(VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat)))
+                        VideoRecEncodeAndWrite(pDisplay->mpVideoRecContext, ulGuestWidth, ulGuestHeight);
         }
     }