From patchwork Wed May 19 07:24:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,05/12] vnc: adjust compression zstream level Date: Tue, 18 May 2010 21:24:05 -0000 From: Corentin Chary X-Patchwork-Id: 52954 Message-Id: <1274253852-16068-6-git-send-email-corentincj@iksaif.net> To: qemu-devel@nongnu.org Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke 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;