From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49241 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEHmp-0004nn-Ng for qemu-devel@nongnu.org; Tue, 18 May 2010 04:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEHDS-0007xm-G5 for qemu-devel@nongnu.org; Tue, 18 May 2010 03:30:53 -0400 Received: from iksaif.net ([88.191.73.63]:38566) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEHDM-0007vX-3i for qemu-devel@nongnu.org; Tue, 18 May 2010 03:27:49 -0400 From: Corentin Chary Date: Tue, 18 May 2010 09:31:15 +0200 Message-Id: <1274167881-6966-5-git-send-email-corentincj@iksaif.net> In-Reply-To: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> References: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> Subject: [Qemu-devel] [PATCH 04/10] vnc: adjust compression zstream level List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke 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; -- 1.7.0.2