From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjPzi-0005qk-LP for qemu-devel@nongnu.org; Thu, 21 Nov 2013 03:52:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjPzd-0006KV-2u for qemu-devel@nongnu.org; Thu, 21 Nov 2013 03:52:14 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:35786 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjPzc-0006KG-O4 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 03:52:09 -0500 From: Peter Lieven Date: Thu, 21 Nov 2013 09:51:17 +0100 Message-Id: <1385023877-26524-7-git-send-email-pl@kamp.de> In-Reply-To: <1385023877-26524-1-git-send-email-pl@kamp.de> References: <1385023877-26524-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv2 6/6] ui/vnc: disable adaptive update calculations if not needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: corentincj@iksaif.net, Peter Lieven , hengqing.hu@gmail.com, anthony@codemonkey.ws Signed-off-by: Peter Lieven --- ui/vnc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 5134456..46a9428 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3169,7 +3169,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) acl = 1; #endif } else if (strncmp(options, "lossy", 5) == 0) { +#ifdef CONFIG_VNC_JPEG vs->lossy = true; +#endif } else if (strncmp(options, "non-adaptive", 12) == 0) { vs->non_adaptive = true; } else if (strncmp(options, "share=", 6) == 0) { @@ -3186,6 +3188,13 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) } } + /* adaptive updates are only used with tight encoding and + * if lossy updates are enabled so we can disable all the + * calculations otherwise */ + if (!vs->lossy) { + vs->non_adaptive = true; + } + #ifdef CONFIG_VNC_TLS if (acl && x509 && vs->tls.x509verify) { if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { -- 1.7.9.5