qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Corentin Chary <corentincj@iksaif.net>
To: qemu-devel@nongnu.org
Cc: Corentin Chary <corentincj@iksaif.net>,
	Anthony Liguori <aliguori@linux.vnet.ibm.com>,
	Alexander Graf <agraf@suse.de>, Adam Litke <agl@us.ibm.com>
Subject: [Qemu-devel] [PATCH 04/10] vnc: adjust compression zstream level
Date: Tue, 18 May 2010 09:31:15 +0200	[thread overview]
Message-ID: <1274167881-6966-5-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1274167881-6966-1-git-send-email-corentincj@iksaif.net>

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 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

  parent reply	other threads:[~2010-05-18  8:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-18  7:31 [Qemu-devel] (no subject) Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 01/10] vnc: refactor set_encodings Corentin Chary
2010-05-18  9:18   ` [Qemu-devel] " Alexander Graf
2010-05-18  9:56     ` Corentin Chary
2010-05-18  9:58       ` Alexander Graf
2010-05-18  9:19   ` Alexander Graf
2010-05-18  9:53     ` Corentin Chary
2010-05-18  9:56       ` Alexander Graf
2010-05-18  7:31 ` [Qemu-devel] [PATCH 02/10] vnc: really call zlib if we want zlib Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 03/10] vnc: only use a single zlib stream Corentin Chary
2010-05-18  7:31 ` Corentin Chary [this message]
2010-05-18  7:31 ` [Qemu-devel] [PATCH 05/10] vnc: add basic tight support Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 06/10] vnc: add support for tight fill encoding Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 07/10] vnc: don't clear zlib stream on set_encoding Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 08/10] vnc: remove memory leaks in zlib and tight encoding Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 09/10] vnc: tight: add palette encoding Corentin Chary
2010-05-18  7:31 ` [Qemu-devel] [PATCH 10/10] vnc: update copyrights for vnc-encoding-tight.c Corentin Chary

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1274167881-6966-5-git-send-email-corentincj@iksaif.net \
    --to=corentincj@iksaif.net \
    --cc=agl@us.ibm.com \
    --cc=agraf@suse.de \
    --cc=aliguori@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).