Changeset 50364 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp

Timestamp:

Feb 7, 2014 2:11:50 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92115

Message:

crOpenGL: screenshot support; a bit of performance for video recording

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp

@@ -658 +658 @@
 }
 
-DECLEXPORT(int) crServerVBoxScreenshotGet(uint32_t u32Screen, CR_SCREENSHOT *pScreenshot)
+DECLEXPORT(void) crServerVBoxScreenshotRelease(CR_SCREENSHOT *pScreenshot)
+{
+    if (pScreenshot->fDataAllocated)
+    {
+        RTMemFree(pScreenshot->Img.pvData);
+        pScreenshot->fDataAllocated = 0;
+    }
+}
+
+DECLEXPORT(int) crServerVBoxScreenshotGet(uint32_t u32Screen, uint32_t width, uint32_t height, uint32_t pitch, void *pvBuffer, CR_SCREENSHOT *pScreenshot)
 {
     HCR_FRAMEBUFFER hFb = CrPMgrFbGetEnabled(u32Screen);
@@ -666 +675 @@
     const VBVAINFOSCREEN *pScreen = CrFbGetScreenInfo(hFb);
 
-    if (CrFbHas3DData(hFb))
-    {
-        RTPOINT Pos = {0, 0};
+    if (!width)
+        width = pScreen->u32Width;
+    if (!height)
+        height = pScreen->u32Height;
+    if (!pitch)
+        pitch = pScreen->u32LineSize;
+
+    if (CrFbHas3DData(hFb)
+            || pScreen->u32Width != width
+            || pScreen->u32Height != height
+            || pScreen->u32LineSize != pitch
+            || pScreen->u16BitsPerPixel != 32)
+    {
         RTRECT Rect;
 
         pScreenshot->Img.cbData = pScreen->u32LineSize * pScreen->u32Height;
-        pScreenshot->Img.pvData = RTMemAlloc(pScreenshot->Img.cbData);
-        if (!pScreenshot->Img.pvData)
-        {
-            WARN(("RTMemAlloc failed"));
-            return VERR_NO_MEMORY;
+        if (!pvBuffer)
+        {
+            pScreenshot->Img.pvData = RTMemAlloc(pScreenshot->Img.cbData);
+            if (!pScreenshot->Img.pvData)
+            {
+                WARN(("RTMemAlloc failed"));
+                return VERR_NO_MEMORY;
+            }
+            pScreenshot->fDataAllocated = 1;
+        }
+        else
+        {
+            pScreenshot->Img.pvData = pvBuffer;
+            pScreenshot->fDataAllocated = 0;
+        }
+
+        pScreenshot->Img.enmFormat = GL_BGRA;
+        pScreenshot->Img.width = width;
+        pScreenshot->Img.height = height;
+        pScreenshot->Img.bpp = 32;
+        pScreenshot->Img.pitch = pitch;
+        Rect.xLeft = 0;
+        Rect.yTop = 0;
+        Rect.xRight = pScreen->u32Width;
+        Rect.yBottom = pScreen->u32Height;
+        int rc = CrFbBltGetContents(hFb, &Rect, 1, &Rect, &pScreenshot->Img);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("CrFbBltGetContents failed %d", rc));
+            crServerVBoxScreenshotRelease(pScreenshot);
+            return rc;
+        }
+    }
+    else
+    {
+        pScreenshot->Img.cbData = pScreen->u32LineSize * pScreen->u32Height;
+        if (!pvBuffer)
+            pScreenshot->Img.pvData = CrFbGetVRAM(hFb);
+        else
+        {
+            pScreenshot->Img.pvData = pvBuffer;
+            memcpy(pvBuffer, CrFbGetVRAM(hFb), pScreenshot->Img.cbData);
         }
         pScreenshot->Img.enmFormat = GL_BGRA;
@@ -683 +739 @@
         pScreenshot->Img.bpp = pScreen->u16BitsPerPixel;
         pScreenshot->Img.pitch = pScreen->u32LineSize;
-        Rect.xLeft = 0;
-        Rect.yTop = 0;
-        Rect.xRight = pScreenshot->Img.width;
-        Rect.yBottom = pScreenshot->Img.height;
-        int rc = CrFbBltGetContents(hFb, &Pos, 1, &Rect, &pScreenshot->Img);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("CrFbBltGetContents failed %d", rc));
-            RTMemFree(pScreenshot->Img.pvData);
-            return rc;
-        }
-        pScreenshot->fDataIsFbDirect = 0;
-    }
-    else
-    {
-        pScreenshot->Img.pvData = CrFbGetVRAM(hFb);
-        pScreenshot->Img.cbData = pScreen->u32LineSize * pScreen->u32Height;
-        pScreenshot->Img.enmFormat = GL_BGRA;
-        pScreenshot->Img.width = pScreen->u32Width;
-        pScreenshot->Img.height = pScreen->u32Height;
-        pScreenshot->Img.bpp = pScreen->u16BitsPerPixel;
-        pScreenshot->Img.pitch = pScreen->u32LineSize;
-
-        pScreenshot->fDataIsFbDirect = 1;
+
+        pScreenshot->fDataAllocated = 0;
     }
 
@@ -712 +746 @@
 
     return VINF_SUCCESS;
-}
-
-DECLEXPORT(void) crServerVBoxScreenshotRelease(CR_SCREENSHOT *pScreenshot)
-{
-    if (!pScreenshot->fDataIsFbDirect)
-    {
-        RTMemFree(pScreenshot->Img.pvData);
-        pScreenshot->fDataIsFbDirect = 1;
-    }
 }