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

Timestamp:

Aug 17, 2010 10:18:05 AM (14 years ago)

Author:

vboxsync

Message:

Main: PNG screenshoting API

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -250 +250 @@
 
 static int displayMakePNG(uint8_t *pu8Data, uint32_t cx, uint32_t cy,
-                          uint8_t **ppu8PNG, uint32_t *pcbPNG, uint32_t *pcxPNG, uint32_t *pcyPNG)
+                          uint8_t **ppu8PNG, uint32_t *pcbPNG, uint32_t *pcxPNG, uint32_t *pcyPNG,
+                          uint8_t fLimitSize)
 {
     int rc = VINF_SUCCESS;
@@ -259 +260 @@
     uint32_t volatile cyBitmap = 0; /* gcc setjmp warning */
 
-    if (cx < kMaxSizePNG && cy < kMaxSizePNG)
+    if (!fLimitSize || (cx < kMaxSizePNG && cy < kMaxSizePNG))
     {
         /* Save unscaled screenshot. */
@@ -448 +449 @@
             /* Prepare a small thumbnail and a PNG screenshot. */
             displayMakeThumbnail(pu8Data, cx, cy, &pu8Thumbnail, &cbThumbnail, &cxThumbnail, &cyThumbnail);
-            displayMakePNG(pu8Data, cx, cy, &pu8PNG, &cbPNG, &cxPNG, &cyPNG);
+            displayMakePNG(pu8Data, cx, cy, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 1);
 
             /* This can be called from any thread. */
@@ -2603 +2604 @@
 
         com::SafeArray<BYTE> screenData (cbData);
-        for (unsigned i = 0; i < cbData; i++)
-            screenData[i] = pu8Data[i];
+        screenData.initFrom(pu8Data, cbData);
         screenData.detachTo(ComSafeArrayOutArg(aScreenData));
     }
@@ -2620 +2620 @@
     return rc;
 }
+
+STDMETHODIMP Display::TakeScreenShotPNGToArray (ULONG aScreenId, ULONG width, ULONG height,
+                                             ComSafeArrayOut(BYTE, aScreenData))
+{
+    LogFlowFuncEnter();
+    LogFlowFunc (("width=%d, height=%d\n",
+                  width, height));
+
+    CheckComArgOutSafeArrayPointerValid(aScreenData);
+    CheckComArgExpr(width, width != 0);
+    CheckComArgExpr(height, height != 0);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    CHECK_CONSOLE_DRV (mpDrv);
+
+    Console::SafeVMPtr pVM(mParent);
+    if (FAILED(pVM.rc())) return 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;
+
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+    int vrc = displayTakeScreenshot(pVM, this, mpDrv, aScreenId, pu8Data, width, height);
+#else
+    int vrc = displayTakeScreenshot(pVM, mpDrv, pu8Data, width, height);
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
+
+    if (RT_SUCCESS(vrc))
+    {
+        uint8_t *pu8PNG = NULL;
+        uint32_t cbPNG = 0;
+        uint32_t cxPNG = 0;
+        uint32_t cyPNG = 0;
+
+        displayMakePNG(pu8Data, width, height, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 0);
+
+        com::SafeArray<BYTE> screenData (cbPNG);
+        screenData.initFrom(pu8PNG, cbPNG);
+        RTMemFree(pu8PNG);
+
+        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);
+
+    RTMemFree(pu8Data);
+
+    LogFlowFunc (("rc=%08X\n", rc));
+    LogFlowFuncLeave();
+    return rc;
+}
+
 
 #ifdef VBOX_WITH_OLD_VBVA_LOCK

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -10702 +10702 @@
   <interface
      name="IDisplay" extends="$unknown"
-     uuid="1fa79e39-0cc9-4ab3-9df3-ed3e96b42496"
+     uuid="09EED313-CD56-4D06-BD56-FAC0F716B5DD"
      wsmap="managed"
      >
@@ -10818 +10818 @@
         for scriptable languages not allowed to manipulate with addresses
         directly.
+
+        <result name="E_NOTIMPL">
+          Feature not implemented.
+        </result>
+        <result name="VBOX_E_IPRT_ERROR">
+          Could not take a screenshot.
+        </result>
+      </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Monitor to take screenshot from.
+        </desc>
+      </param>
+      <param name="width" type="unsigned long" dir="in">
+        <desc>
+          Desired image width.
+        </desc>
+      </param>
+      <param name="height" type="unsigned long" dir="in">
+        <desc>
+          Desired image height.
+        </desc>
+      </param>
+      <param name="screenData" type="octet" dir="return" safearray="yes">
+        <desc>
+          Array with resulting screen data.
+        </desc>
+      </param>
+    </method>
+
+     <method name="takeScreenShotPNGToArray">
+      <desc>
+        Takes a guest screen shot of the requested size and returns it as
+        PNG image in array.
 
         <result name="E_NOTIMPL">

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -155 +155 @@
     STDMETHOD(TakeScreenShot)(ULONG aScreenId, BYTE *address, ULONG width, ULONG height);
     STDMETHOD(TakeScreenShotToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
+    STDMETHOD(TakeScreenShotPNGToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
     STDMETHOD(DrawToScreen)(ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();