From patchwork Wed Jul 7 18:57:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 58152 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 368AEB6EF3 for ; Thu, 8 Jul 2010 05:17:26 +1000 (EST) Received: from localhost ([127.0.0.1]:47288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWa6o-0002HO-K4 for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 15:16:38 -0400 Received: from [140.186.70.92] (port=34987 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWZoh-000876-A5 for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:58:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWZoc-0002gC-9G for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:55 -0400 Received: from iksaif.net ([88.191.73.63]:35192) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWZoc-0002fJ-4O for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:50 -0400 Received: from falgoret.iksaif.net (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 890F4C90085; Wed, 7 Jul 2010 20:58:14 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Wed, 7 Jul 2010 20:57:57 +0200 Message-Id: <1278529086-10391-10-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> References: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf Subject: [Qemu-devel] [PATCH v2 09/18] vnc: tight: specific zlib level and filters for each compression level 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 Disable png filters for lower compression levels. This should lower the CPU consumption and reduce encoding time. This isn't in tight_conf because: * tight_conf structure must not change, because it's shared with other tight implementations (libvncserver, etc..). * it'd exceed the 80 col limit. * PNG_ macros are only defined if CONFIG_VNC_PNG is defined Signed-off-by: Corentin Chary --- ui/vnc-enc-tight.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index cc57c26..e627e00 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -73,6 +73,21 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); #ifdef CONFIG_VNC_PNG +static const struct { + int png_zlib_level, png_filters; +} tight_png_conf[] = { + { 0, PNG_NO_FILTERS }, + { 1, PNG_NO_FILTERS }, + { 2, PNG_NO_FILTERS }, + { 3, PNG_NO_FILTERS }, + { 4, PNG_NO_FILTERS }, + { 5, PNG_ALL_FILTERS }, + { 6, PNG_ALL_FILTERS }, + { 7, PNG_ALL_FILTERS }, + { 8, PNG_ALL_FILTERS }, + { 9, PNG_ALL_FILTERS }, +}; + static int send_png_rect(VncState *vs, int x, int y, int w, int h, QDict *palette); @@ -1425,7 +1440,8 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, png_infop info_ptr; png_colorp png_palette = NULL; size_t offset; - int level = tight_conf[vs->tight_compression].raw_zlib_level; + int level = tight_png_conf[vs->tight_compression].png_zlib_level; + int filters = tight_png_conf[vs->tight_compression].png_filters; uint8_t *buf; int dy; @@ -1444,6 +1460,7 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, png_set_write_fn(png_ptr, (void *) vs, png_write_data, png_flush_data); png_set_compression_level(png_ptr, level); + png_set_filter(png_ptr, PNG_FILTER_TYPE_DEFAULT, filters); if (palette) { color_type = PNG_COLOR_TYPE_PALETTE;