Patchwork [v2,04/10] vnc: adjust compression zstream level

login
register
mail settings
Submitter Corentin Chary
Date May 18, 2010, 12:49 p.m.
Message ID <1274186986-26878-5-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/52879/
State New
Headers show

Comments

Corentin Chary - May 18, 2010, 12:49 p.m.
Adjust zlib compression level if needed by calling deflateParams.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 vnc-encoding-zlib.c |    9 ++++++++-
 vnc.h               |    1 +
 2 files changed, 9 insertions(+), 1 deletions(-)
Alexander Graf - May 18, 2010, 12:55 p.m.
Corentin Chary wrote:
> Adjust zlib compression level if needed by calling deflateParams.
>
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
>   

Wow, I didn't know it was that easy :).

Acked-by: Alexander Graf <agraf@suse.de>

Patch

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;