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

Timestamp:

Feb 4, 2014 2:04:35 PM (11 years ago)

Author:

vboxsync

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

92039

Message:

ConsoleVRDPServer: another bitmap format for 3d redirect.

File:

• trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp (modified) (4 diffs)

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

@@ -1774 +1774 @@
     bool fCreated;
     bool fFallback;
+    bool fTopDown;
 } H3DORInstance;
 
@@ -1802 +1803 @@
         {
             /* Accept it. */
+            p->fTopDown = true;
+        }
+        else if (RTStrICmp(pszFormat, H3DOR_FMT_RGBA) == 0)
+        {
+            /* Accept it. */
+            p->fTopDown = false;
         }
         else
@@ -1987 +1994 @@
     image.cbData = cbData;
     image.pvScanLine0 = (uint8_t *)pvData + (p->h - 1) * p->w * 4;
-    image.iScanDelta = -4 * p->w;
+    image.iScanDelta = 4 * p->w;
+    if (p->fTopDown)
+    {
+        image.iScanDelta = -image.iScanDelta;
+    }
 
     p->pThis->m_interfaceImage.VRDEImageUpdate (p->hImageBitmap,
@@ -2025 +2036 @@
     {
         /* Return a comma separated list of supported formats. */
-        static const char *pszSupportedFormats = H3DOR_FMT_RGBA_TOPDOWN;
-        uint32_t cbOut = (uint32_t)strlen(pszSupportedFormats) + 1;
+        uint32_t cbOut =   (uint32_t)strlen(H3DOR_FMT_RGBA_TOPDOWN) + 1
+                         + (uint32_t)strlen(H3DOR_FMT_RGBA) + 1;
         if (cbOut <= cbBuffer)
         {
-            memcpy(pvBuffer, pszSupportedFormats, cbOut);
+            char *pch = (char *)pvBuffer;
+            memcpy(pch, H3DOR_FMT_RGBA_TOPDOWN, strlen(H3DOR_FMT_RGBA_TOPDOWN));
+            pch += strlen(H3DOR_FMT_RGBA_TOPDOWN);
+            *pch++ = ',';
+            memcpy(pch, H3DOR_FMT_RGBA, strlen(H3DOR_FMT_RGBA));
+            pch += strlen(H3DOR_FMT_RGBA);
+            *pch++ = '\0';
         }
         else