diff options
| author | Corentin Chary | 2010-05-19 09:24:04 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-06-01 19:53:09 +0200 |
| commit | b05ad290e2a5d9074179fede31d54371e1a09a6a (patch) | |
| tree | cbe46b8d447740a8c024d07953d77d53a96a72c7 /vnc-encoding-zlib.c | |
| parent | vnc: really call zlib if we want zlib (diff) | |
| download | qemu-b05ad290e2a5d9074179fede31d54371e1a09a6a.tar.gz qemu-b05ad290e2a5d9074179fede31d54371e1a09a6a.tar.xz qemu-b05ad290e2a5d9074179fede31d54371e1a09a6a.zip | |
vnc: only use a single zlib stream
According to http://tigervnc.org/cgi-bin/rfbproto#zlib-encoding
zlib encoding only uses a single stream. Current implementation defines
4 streams but only uses the first one. Remove them and only use a single
stream.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vnc-encoding-zlib.c')
| -rw-r--r-- | vnc-encoding-zlib.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 4a495adf94..6a16a79947 100644 --- a/vnc-encoding-zlib.c +++ b/vnc-encoding-zlib.c @@ -54,9 +54,9 @@ static void vnc_zlib_start(VncState *vs) vs->output = vs->zlib; } -static int vnc_zlib_stop(VncState *vs, int stream_id) +static int vnc_zlib_stop(VncState *vs) { - z_streamp zstream = &vs->zlib_stream[stream_id]; + z_streamp zstream = &vs->zlib_stream; int previous_out; // switch back to normal output/zlib buffers @@ -70,7 +70,7 @@ static int vnc_zlib_stop(VncState *vs, int stream_id) if (zstream->opaque != vs) { int err; - VNC_DEBUG("VNC: initializing zlib stream %d\n", stream_id); + VNC_DEBUG("VNC: initializing zlib stream\n"); VNC_DEBUG("VNC: opaque = %p | vs = %p\n", zstream->opaque, vs); zstream->zalloc = zalloc; zstream->zfree = zfree; @@ -122,7 +122,7 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) // compress the stream vnc_zlib_start(vs); vnc_raw_send_framebuffer_update(vs, x, y, w, h); - bytes_written = vnc_zlib_stop(vs, 0); + bytes_written = vnc_zlib_stop(vs); if (bytes_written == -1) return; @@ -136,7 +136,5 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) void vnc_zlib_init(VncState *vs) { - int i; - for (i=0; i<(sizeof(vs->zlib_stream) / sizeof(z_stream)); i++) - vs->zlib_stream[i].opaque = NULL; + vs->zlib_stream.opaque = NULL; } |