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

Timestamp:

May 28, 2013 7:38:04 AM (12 years ago)

Author:

vboxsync

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

86037

Message:

ConsoleVRDPServer: image interface fix and logging updates

File:

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

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

@@ -1723 +1723 @@
     uint32_t h;
     bool fCreated;
+    bool fFallback;
 } H3DORInstance;
+
+#define H3DORLOG Log
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::H3DORBegin(const void *pvContext, void **ppvInstance,
                                                               const char *pszFormat)
 {
-    LogFlowFunc(("ctx %p\n", pvContext));
-
-    H3DORInstance *p = (H3DORInstance *)RTMemAlloc(sizeof (H3DORInstance));
+    H3DORLOG(("H3DORBegin: ctx %p [%s]\n", pvContext, pszFormat));
+
+    H3DORInstance *p = (H3DORInstance *)RTMemAlloc(sizeof(H3DORInstance));
 
     if (p)
@@ -1741 +1744 @@
         p->h = 0;
         p->fCreated = false;
+        p->fFallback = false;
 
         /* Host 3D service passes the actual format of data in this redirect instance.
@@ -1756 +1760 @@
     }
 
-    /* Caller check this for NULL. */
+    H3DORLOG(("H3DORBegin: ins %p\n", p));
+
+    /* Caller checks this for NULL. */
     *ppvInstance = p;
 }
@@ -1763 +1769 @@
                                                                  int32_t x, int32_t y, uint32_t w, uint32_t h)
 {
-    LogFlowFunc(("ins %p %d,%d %dx%d\n", pvInstance, x, y, w, h));
+    H3DORLOG(("H3DORGeometry: ins %p %d,%d %dx%d\n", pvInstance, x, y, w, h));
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
@@ -1792 +1798 @@
             && p->h == h)
         {
-            LogFlowFunc(("geometry not changed\n"));
+            H3DORLOG(("H3DORGeometry: geometry not changed\n"));
             /* Do nothing. Continue using the existing handle. */
         }
         else
         {
-            int rc = p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
+            int rc = p->fFallback?
+                        rc = VERR_NOT_SUPPORTED: /* Try to go out of fallback mode. */
+                        p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
             if (RT_SUCCESS(rc))
             {
@@ -1826 +1834 @@
                                    */
         uint32_t fu32CompletionFlags = 0;
+        p->fFallback = false;
         int rc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
                                                                   &p->hImageBitmap,
@@ -1840 +1849 @@
         {
             /* No support for a 3D + WINDOW. Try bitmap updates. */
+            H3DORLOG(("H3DORGeometry: Fallback to bitmaps\n"));
             fu32CompletionFlags = 0;
+            p->fFallback = true;
             rc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
                                                                   &p->hImageBitmap,
@@ -1853 +1864 @@
         }
 
+        H3DORLOG(("H3DORGeometry: Image handle create %Rrc, flags 0x%RX32\n", rc, fu32CompletionFlags));
+
         if (RT_SUCCESS(rc))
         {
@@ -1872 +1885 @@
         }
     }
+
+    H3DORLOG(("H3DORGeometry: ins %p completed\n", pvInstance));
 }
 
@@ -1877 +1892 @@
                                                                       uint32_t cRects, const RTRECT *paRects)
 {
-    LogFlowFunc(("ins %p %d\n", pvInstance, cRects));
+    H3DORLOG(("H3DORVisibleRegion: ins %p %d\n", pvInstance, cRects));
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
@@ -1901 +1916 @@
                                                        paRects);
     }
+
+    H3DORLOG(("H3DORVisibleRegion: ins %p completed\n", pvInstance));
 }
 
@@ -1906 +1923 @@
                                                               void *pvData, uint32_t cbData)
 {
-    LogFlowFunc(("ins %p %p %d\n", pvInstance, pvData, cbData));
+    H3DORLOG(("H3DORFrame: ins %p %p %d\n", pvInstance, pvData, cbData));
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
@@ -1929 +1946 @@
                                                 &image,
                                                 sizeof(VRDEIMAGEBITMAP));
+
+    H3DORLOG(("H3DORFrame: ins %p completed\n", pvInstance));
 }
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::H3DOREnd(void *pvInstance)
 {
-    LogFlowFunc(("ins %p\n", pvInstance));
+    H3DORLOG(("H3DOREnd: ins %p\n", pvInstance));
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
@@ -1942 +1961 @@
 
     RTMemFree(p);
+
+    H3DORLOG(("H3DOREnd: ins %p completed\n", pvInstance));
 }
 
@@ -1948 +1969 @@
 {
     int rc = VINF_SUCCESS;
+
+    H3DORLOG(("H3DORContextProperty: index %d\n", index));
 
     if (index == H3DOR_PROP_FORMATS)
@@ -1969 +1992 @@
     }
 
+    H3DORLOG(("H3DORContextProperty: %Rrc\n", rc));
     return rc;
 }
@@ -2048 +2072 @@
                                                                      uint32_t cbData)
 {
-    LogFlowFunc(("pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n",
-                 pvContext, pvUser, hVideo, u32Id, pvData, cbData));
+    H3DORLOG(("H3DOR: VRDEImageCbNotify: pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n",
+              pvContext, pvUser, hVideo, u32Id, pvData, cbData));
 
     ConsoleVRDPServer *pServer = static_cast<ConsoleVRDPServer*>(pvContext);
@@ -2066 +2090 @@
 
         uint32_t u32StreamId = *(uint32_t *)pvData;
-        LogFlowFunc(("VRDE_IMAGE_NOTIFY_HANDLE_CREATE u32StreamId %d\n",
-                     u32StreamId));
+        H3DORLOG(("H3DOR: VRDE_IMAGE_NOTIFY_HANDLE_CREATE u32StreamId %d\n",
+                  u32StreamId));
 
         if (u32StreamId != 0)
@@ -2081 +2105 @@
     return VINF_SUCCESS;
 }
+
+#undef H3DORLOG
 
 /* static */ DECLCALLBACK(int) ConsoleVRDPServer::VRDESCardCbNotify(void *pvContext,