Changeset 28802 in vbox

Timestamp:

Apr 27, 2010 9:23:16 AM (15 years ago)

Author:

vboxsync

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

60695

Message:

VRDP video channel configuration API.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• include/VBox/vrdpapi.h (modified) (1 diff)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/VRDPServerImpl.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -265 +265 @@
           ulAuthTimeout(5000),
           fAllowMultiConnection(false),
-          fReuseSingleConnection(false)
+          fReuseSingleConnection(false),
+          fVideoChannel(false),
+          ulVideoChannelQuality(75)
     {}
 
@@ -276 +278 @@
     uint32_t        ulAuthTimeout;
     bool            fAllowMultiConnection,
-                    fReuseSingleConnection;
+                    fReuseSingleConnection,
+                    fVideoChannel;
+    uint32_t        ulVideoChannelQuality;
 };
 

trunk/include/VBox/vrdpapi.h

@@ -955 +955 @@
 #define VRDP_QP_NUMBER_MONITORS   (3)
 #define VRDP_QP_NETWORK_PORT_RANGE (4)
+#ifdef VBOX_WITH_VRDP_VIDEO_CHANNEL
+#define VRDP_QP_VIDEO_CHANNEL         (5)
+#define VRDP_QP_VIDEO_CHANNEL_QUALITY (6)
+#endif /* VBOX_WITH_VRDP_VIDEO_CHANNEL */
 
 #define VRDP_SP_BASE 0x1000

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -756 +756 @@
             *pcbOut = (uint32_t)cbPortRange;
         } break;
+
+#ifdef VBOX_WITH_VRDP_VIDEO_CHANNEL
+        case VRDP_QP_VIDEO_CHANNEL:
+        {
+            BOOL fVideoEnabled = FALSE;
+
+            server->mConsole->getVRDPServer()->COMGETTER(VideoChannel)(&fVideoEnabled);
+
+            if (cbBuffer >= sizeof(uint32_t))
+            {
+                *(uint32_t *)pvBuffer = (uint32_t)fVideoEnabled;
+                rc = VINF_SUCCESS;
+            }
+            else
+            {
+                rc = VINF_BUFFER_OVERFLOW;
+            }
+
+            *pcbOut = sizeof(uint32_t);
+        } break;
+
+        case VRDP_QP_VIDEO_CHANNEL_QUALITY:
+        {
+            ULONG ulQuality = 0;
+
+            server->mConsole->getVRDPServer()->COMGETTER(VideoChannelQuality)(&ulQuality);
+
+            if (cbBuffer >= sizeof(uint32_t))
+            {
+                *(uint32_t *)pvBuffer = (uint32_t)ulQuality;
+                rc = VINF_SUCCESS;
+            }
+            else
+            {
+                rc = VINF_BUFFER_OVERFLOW;
+            }
+
+            *pcbOut = sizeof(uint32_t);
+        } break;
+#endif /* VBOX_WITH_VRDP_VIDEO_CHANNEL */
 
         case VRDP_SP_NETWORK_BIND_PORT:

trunk/src/VBox/Main/Makefile.kmk

@@ -547 +547 @@
         VBOX_COM_INPROC \
         $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
+        $(if $(VBOX_WITH_VRDP_VIDEO_CHANNEL),VBOX_WITH_VRDP_VIDEO_CHANNEL,) \
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
         $(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \

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

@@ -12842 +12842 @@
     </attribute>
 
+    <attribute name="videoChannel" type="boolean">
+      <desc>
+        Flag whether RDP video channel is supported.
+      </desc>
+    </attribute>
+
+    <attribute name="videoChannelQuality" type="unsigned long">
+      <desc>
+        Image quality in percents.
+      </desc>
+    </attribute>
+
   </interface>
 

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

@@ -47 +47 @@
         BOOL mAllowMultiConnection;
         BOOL mReuseSingleConnection;
+        BOOL mVideoChannel;
+        ULONG mVideoChannelQuality;
     };
 
@@ -87 +89 @@
     STDMETHOD(COMGETTER(ReuseSingleConnection)) (BOOL *aReuseSingleConnection);
     STDMETHOD(COMSETTER(ReuseSingleConnection)) (BOOL aReuseSingleConnection);
+    STDMETHOD(COMGETTER(VideoChannel)) (BOOL *aVideoChannel);
+    STDMETHOD(COMSETTER(VideoChannel)) (BOOL aVideoChannel);
+    STDMETHOD(COMGETTER(VideoChannelQuality)) (ULONG *aVideoChannelQuality);
+    STDMETHOD(COMSETTER(VideoChannelQuality)) (ULONG aVideoChannelQuality);
 
     // IVRDPServer methods

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1317 +1317 @@
                   && (fAllowMultiConnection     == v.fAllowMultiConnection)
                   && (fReuseSingleConnection    == v.fReuseSingleConnection)
+                  && (fVideoChannel             == v.fVideoChannel)
+                  && (ulVideoChannelQuality     == v.ulVideoChannelQuality)
                 )
            );
@@ -2311 +2313 @@
             pelmHwChild->getAttributeValue("allowMultiConnection", hw.vrdpSettings.fAllowMultiConnection);
             pelmHwChild->getAttributeValue("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
+
+            const xml::ElementNode *pelmVideoChannel;
+            if ((pelmVideoChannel = pelmHwChild->findChildElement("VideoChannel")))
+            {
+                pelmVideoChannel->getAttributeValue("enabled", hw.vrdpSettings.fVideoChannel);
+                pelmVideoChannel->getAttributeValue("quality", hw.vrdpSettings.ulVideoChannelQuality);
+                RT_CLAMP(hw.vrdpSettings.ulVideoChannelQuality, 10, 100);
+            }
         }
         else if (pelmHwChild->nameEquals("BIOS"))
@@ -3247 +3257 @@
         pelmVRDP->setAttribute("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
 
+    if (m->sv >= SettingsVersion_v1_10)
+    {
+        xml::ElementNode *pelmVideoChannel = pelmVRDP->createChild("VideoChannel");
+        pelmVideoChannel->setAttribute("enabled", hw.vrdpSettings.fVideoChannel);
+        pelmVideoChannel->setAttribute("quality", hw.vrdpSettings.ulVideoChannelQuality);
+    }
+
     xml::ElementNode *pelmBIOS = pelmHardware->createChild("BIOS");
     pelmBIOS->createChild("ACPI")->setAttribute("enabled", hw.biosSettings.fACPIEnabled);
@@ -4061 +4078 @@
             m->sv = SettingsVersion_v1_10;
     }
+
+    // VirtualBox 3.2 adds support for VRDP video channel
+    if (    m->sv < SettingsVersion_v1_10
+         && (    hardwareMachine.vrdpSettings.fVideoChannel
+            )
+       )
+        m->sv = SettingsVersion_v1_10;
+
 }