From patchwork Wed May 19 07:24:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 52954 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 43014B7EB8 for ; Wed, 19 May 2010 17:27:19 +1000 (EST) Received: from localhost ([127.0.0.1]:43014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEdgR-0006zl-Jv for incoming@patchwork.ozlabs.org; Wed, 19 May 2010 03:27:15 -0400 Received: from [140.186.70.92] (port=54579 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEda5-0004AJ-BF for qemu-devel@nongnu.org; Wed, 19 May 2010 03:20:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEdZw-0008Nl-4x for qemu-devel@nongnu.org; Wed, 19 May 2010 03:20:41 -0400 Received: from iksaif.net ([88.191.73.63]:39152) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEdZu-0008Mn-GO for qemu-devel@nongnu.org; Wed, 19 May 2010 03:20:30 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id E56D6C90029; Wed, 19 May 2010 09:24:13 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Wed, 19 May 2010 09:24:05 +0200 Message-Id: <1274253852-16068-6-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1274253852-16068-1-git-send-email-corentincj@iksaif.net> References: <1274253852-16068-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 , Adam Litke Subject: [Qemu-devel] [PATCH v3 05/12] vnc: adjust compression zstream 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 Adjust zlib compression level if needed by calling deflateParams. Signed-off-by: Corentin Chary --- vnc-encoding-zlib.c | 9 ++++++++- vnc.h | 1 + 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 6a16a79..29dd1b7 100644 --- a/vnc-encoding-zlib.c +++ b/vnc-encoding-zlib.c @@ -83,10 +83,17 @@ static int vnc_zlib_stop(VncState *vs) return -1; } + vs->zlib_level = vs->tight_compression; zstream->opaque = vs; } - // XXX what to do if tight_compression changed in between? + if (vs->tight_compression != vs->zlib_level) { + if (deflateParams(zstream, vs->tight_compression, + Z_DEFAULT_STRATEGY) != Z_OK) { + return -1; + } + vs->zlib_level = vs->tight_compression; + } // reserve memory in output buffer buffer_reserve(&vs->output, vs->zlib.offset + 64); diff --git a/vnc.h b/vnc.h index dfdb240..96f3fe7 100644 --- a/vnc.h +++ b/vnc.h @@ -174,6 +174,7 @@ struct VncState Buffer zlib; Buffer zlib_tmp; z_stream zlib_stream; + int zlib_level; Notifier mouse_mode_notifier;