From patchwork Fri Feb 4 08:06:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 81827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51B2FB710F for ; Fri, 4 Feb 2011 19:38:42 +1100 (EST) Received: from localhost ([127.0.0.1]:50947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlHBe-00060C-Qe for incoming@patchwork.ozlabs.org; Fri, 04 Feb 2011 03:38:38 -0500 Received: from [140.186.70.92] (port=49646 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlGfl-00045f-Rw for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PlGfk-0001rw-Gh for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:41 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:52983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PlGfj-0001re-S9 for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:40 -0500 Received: from localhost.localdomain (unknown [82.241.209.44]) by smtp5-g21.free.fr (Postfix) with ESMTP id 9F50CD480A9; Fri, 4 Feb 2011 09:05:34 +0100 (CET) From: Corentin Chary To: Anthony Liguori Date: Fri, 4 Feb 2011 09:06:08 +0100 Message-Id: <1296806768-27787-17-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1296806768-27787-1-git-send-email-corentincj@iksaif.net> References: <1296806768-27787-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.5 Cc: Corentin Chary , Andre Przywara , Qemu-development List , Alexander Graf Subject: [Qemu-devel] [PATCH v3 16/16] vnc: add a non-adaptive option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This option allow to disable adaptive behaviors in some encodings. Signed-off-by: Corentin Chary --- qemu-options.hx | 9 +++++++++ ui/vnc-enc-tight.c | 2 +- ui/vnc.c | 13 +++++++++---- ui/vnc.h | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 945edf3..badb730 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -913,6 +913,15 @@ option is set, VNC client may receive lossy framebuffer updates depending on its encoding settings. Enabling this option can save a lot of bandwidth at the expense of quality. +@item non-adaptive + +Disable adaptive encodings. Adaptive encodings are enabled by default. +An adaptive encoding will try to detect frequently updated screen regions, +and send updates in these regions using a lossy encoding (like JPEG). +This can be really helpfull to save bandwidth when playing videos. Disabling +adaptive encodings allow to restore the original static behavior of encodings +like Tight. + @end table ETEXI diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 82c1e96..5933394 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -1546,7 +1546,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) vnc_tight_stop(vs); #ifdef CONFIG_VNC_JPEG - if (vs->tight.quality != (uint8_t)-1) { + if (!vs->vd->non_adaptive && vs->tight.quality != (uint8_t)-1) { double freq = vnc_update_freq(vs, x, y, w, h); if (freq < tight_jpeg_conf[vs->tight.quality].jpeg_freq_min) { diff --git a/ui/vnc.c b/ui/vnc.c index 86c23207..626b430 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2387,10 +2387,12 @@ static int vnc_refresh_server_surface(VncDisplay *vd) VncState *vs; int has_dirty = 0; - struct timeval tv; + struct timeval tv = { 0, 0 }; - gettimeofday(&tv, NULL); - has_dirty = vnc_update_stats(vd, &tv); + if (!vd->non_adaptive) { + gettimeofday(&tv, NULL); + has_dirty = vnc_update_stats(vd, &tv); + } /* * Walk through the guest dirty map. @@ -2419,7 +2421,8 @@ static int vnc_refresh_server_surface(VncDisplay *vd) if (memcmp(server_ptr, guest_ptr, cmp_bytes) == 0) continue; memcpy(server_ptr, guest_ptr, cmp_bytes); - vnc_rect_updated(vd, x, y, &tv); + if (!vd->non_adaptive) + vnc_rect_updated(vd, x, y, &tv); QTAILQ_FOREACH(vs, &vd->clients, next) { set_bit((x / 16), vs->dirty[y]); } @@ -2754,6 +2757,8 @@ int vnc_display_open(DisplayState *ds, const char *display) #endif } else if (strncmp(options, "lossy", 5) == 0) { vs->lossy = true; + } else if (strncmp(options, "non-adapative", 13) == 0) { + vs->non_adaptive = true; } } diff --git a/ui/vnc.h b/ui/vnc.h index 98a1885..8a1e7b9 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -144,6 +144,7 @@ struct VncDisplay time_t expires; int auth; bool lossy; + bool non_adaptive; #ifdef CONFIG_VNC_TLS int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls;