Changeset 24373 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Nov 5, 2009 9:51:34 AM (15 years ago)

Author:

vboxsync

Message:

Updated screenshot API (xTracker 4364).

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -41 +41 @@
 # include <VBox/VBoxVideo.h>
 #endif
+
+#include <VBox/com/array.h>
+
 /**
  * Display driver instance data.
@@ -1533 +1536 @@
 }
 
+static int displayTakeScreenshot(PVM pVM, struct DRVMAINDISPLAY *pDrv, BYTE *address, ULONG width, ULONG height)
+{
+    uint8_t *pu8Data = NULL;
+    size_t cbData = 0;
+    uint32_t cx = 0;
+    uint32_t cy = 0;
+
+    /* @todo pfnTakeScreenshot is probably callable from any thread, because it uses the VGA device lock. */
+    int vrc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)pDrv->pUpPort->pfnTakeScreenshot, 5,
+                              pDrv->pUpPort, &pu8Data, &cbData, &cx, &cy);
+
+    if (RT_SUCCESS(vrc))
+    {
+        if (cx == width && cy == height)
+        {
+            /* No scaling required. */
+            memcpy(address, pu8Data, cbData);
+        }
+        else
+        {
+            /* Scale. */
+            LogFlowFunc(("SCALE: %dx%d -> %dx%d\n", cx, cy, width, height));
+
+            uint8_t *dst = address;
+            uint8_t *src = pu8Data;
+            int dstX = 0;
+            int dstY = 0;
+            int srcX = 0;
+            int srcY = 0;
+            int dstW = width;
+            int dstH = height;
+            int srcW = cx;
+            int srcH = cy;
+            gdImageCopyResampled (dst,
+                                  src,
+                                  dstX, dstY,
+                                  srcX, srcY,
+                                  dstW, dstH, srcW, srcH);
+        }
+
+        /* This can be called from any thread. */
+        pDrv->pUpPort->pfnFreeScreenshot (pDrv->pUpPort, pu8Data);
+    }
+
+    return vrc;
+}
+
 STDMETHODIMP Display::TakeScreenShot (BYTE *address, ULONG width, ULONG height)
 {
@@ -1563 +1613 @@
     LogFlowFunc (("Sending SCREENSHOT request\n"));
 
-    /*
-     * First try use the graphics device features for making a snapshot.
-     * This does not support stretching, is an optional feature (returns
-     * not supported).
+    /* Leave lock because other thread (EMT) is called and it may initiate a resize
+     * which also needs lock.
      *
-     * Note: It may cause a display resize. Watch out for deadlocks.
+     * This method does not need the lock anymore.
      */
-    int rcVBox = VERR_NOT_SUPPORTED;
-    if (    mpDrv->Connector.cx == width
-        &&  mpDrv->Connector.cy == height)
-    {
-        size_t cbData = RT_ALIGN_Z(width, 4) * 4 * height;
-        rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY,  (PFNRT)mpDrv->pUpPort->pfnSnapshot, 6, mpDrv->pUpPort,
-                                 address, cbData, (uintptr_t)NULL, (uintptr_t)NULL, (uintptr_t)NULL);
-    }
-
-    /*
-     * If the function returns not supported, or if stretching is requested,
-     * we'll have to do all the work ourselves using the framebuffer data.
-     */
-    if (rcVBox == VERR_NOT_SUPPORTED || rcVBox == VERR_NOT_IMPLEMENTED)
-    {
-        /** @todo implement snapshot stretching & generic snapshot fallback. */
-        rc = setError (E_NOTIMPL, tr ("This feature is not implemented"));
-    }
-    else if (RT_FAILURE(rcVBox))
+    alock.leave();
+
+    int vrc = displayTakeScreenshot(pVM, mpDrv, address, width, height);
+
+    if (vrc == VERR_NOT_IMPLEMENTED)
+        rc = setError (E_NOTIMPL,
+                       tr ("This feature is not implemented"));
+    else if (RT_FAILURE(vrc))
         rc = setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not take a screenshot (%Rrc)"), rcVBox);
+                       tr ("Could not take a screenshot (%Rrc)"), vrc);
 
     LogFlowFunc (("rc=%08X\n", rc));
@@ -1600 +1637 @@
                                           ComSafeArrayOut(BYTE, aScreenData))
 {
-     HRESULT rc = S_OK;
-
-     rc = setError (E_NOTIMPL, tr ("This feature is not implemented"));
-
-     return rc;
+    LogFlowFuncEnter();
+    LogFlowFunc (("width=%d, height=%d\n",
+                  width, height));
+
+    CheckComArgSafeArrayNotNull(aScreenData);
+    CheckComArgExpr(width, width != 0);
+    CheckComArgExpr(height, height != 0);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    CHECK_CONSOLE_DRV (mpDrv);
+
+    Console::SafeVMPtr pVM (mParent);
+    CheckComRCReturnRC(pVM.rc());
+
+    HRESULT rc = S_OK;
+
+    LogFlowFunc (("Sending SCREENSHOT request\n"));
+
+    /* Leave lock because other thread (EMT) is called and it may initiate a resize
+     * which also needs lock.
+     *
+     * This method does not need the lock anymore.
+     */
+    alock.leave();
+
+    size_t cbData = width * 4 * height;
+    uint8_t *pu8Data = (uint8_t *)RTMemAlloc(cbData);
+
+    if (!pu8Data)
+        return E_OUTOFMEMORY;
+
+    int vrc = displayTakeScreenshot(pVM, mpDrv, pu8Data, width, height);
+
+    if (RT_SUCCESS(vrc))
+    {
+        com::SafeArray<BYTE> screenData (cbData);
+        for (unsigned i = 0; i < cbData; i++)
+            screenData[i] = pu8Data[i];
+        screenData.detachTo(ComSafeArrayOutArg(aScreenData));
+    }
+    else if (vrc == VERR_NOT_IMPLEMENTED)
+        rc = setError (E_NOTIMPL,
+                       tr ("This feature is not implemented"));
+    else
+        rc = setError (VBOX_E_IPRT_ERROR,
+                       tr ("Could not take a screenshot (%Rrc)"), vrc);
+
+    LogFlowFunc (("rc=%08X\n", rc));
+    LogFlowFuncLeave();
+    return rc;
 }