From patchwork Wed Jun 16 07:12:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 55852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 923131007D2 for ; Wed, 16 Jun 2010 16:41:54 +1000 (EST) Received: from localhost ([127.0.0.1]:46138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOmJe-0000Ka-BY for incoming@patchwork.ozlabs.org; Wed, 16 Jun 2010 02:41:38 -0400 Received: from [140.186.70.92] (port=53365 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOlr1-0001to-63 for qemu-devel@nongnu.org; Wed, 16 Jun 2010 02:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOlqw-00032N-3a for qemu-devel@nongnu.org; Wed, 16 Jun 2010 02:12:02 -0400 Received: from iksaif.net ([88.191.73.63]:35947) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOlqv-00030c-KF for qemu-devel@nongnu.org; Wed, 16 Jun 2010 02:11:58 -0400 Received: from tartiflon (lal69-3-82-241-209-44.fbx.proxad.net [82.241.209.44]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id B5701C9005E; Wed, 16 Jun 2010 08:16:18 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Wed, 16 Jun 2010 09:12:08 +0200 Message-Id: <1276672333-14831-12-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1276672333-14831-1-git-send-email-corentincj@iksaif.net> References: <1276672333-14831-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf Subject: [Qemu-devel] [PATCH 11/16] vnc: encapsulate encoding members X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This will allow to implement the threaded VNC server in a more cleaner way. Signed-off-by: Corentin Chary --- ui/vnc-enc-hextile.c | 14 ++-- ui/vnc-enc-tight.c | 194 +++++++++++++++++++++++++------------------------- ui/vnc-enc-zlib.c | 34 +++++----- ui/vnc.c | 8 +- ui/vnc.h | 58 ++++++++------- 5 files changed, 157 insertions(+), 151 deletions(-) diff --git a/ui/vnc-enc-hextile.c b/ui/vnc-enc-hextile.c index fa4b264..364a491 100644 --- a/ui/vnc-enc-hextile.c +++ b/ui/vnc-enc-hextile.c @@ -75,7 +75,7 @@ int vnc_hextile_send_framebuffer_update(VncState *vs, int x, has_fg = has_bg = 0; for (j = y; j < (y + h); j += 16) { for (i = x; i < (x + w); i += 16) { - vs->send_hextile_tile(vs, i, j, + vs->hextile.send_tile(vs, i, j, MIN(16, x + w - i), MIN(16, y + h - j), last_bg, last_fg, &has_bg, &has_fg); } @@ -91,25 +91,25 @@ void vnc_hextile_set_pixel_conversion(VncState *vs, int generic) if (!generic) { switch (vs->ds->surface->pf.bits_per_pixel) { case 8: - vs->send_hextile_tile = send_hextile_tile_8; + vs->hextile.send_tile = send_hextile_tile_8; break; case 16: - vs->send_hextile_tile = send_hextile_tile_16; + vs->hextile.send_tile = send_hextile_tile_16; break; case 32: - vs->send_hextile_tile = send_hextile_tile_32; + vs->hextile.send_tile = send_hextile_tile_32; break; } } else { switch (vs->ds->surface->pf.bits_per_pixel) { case 8: - vs->send_hextile_tile = send_hextile_tile_generic_8; + vs->hextile.send_tile = send_hextile_tile_generic_8; break; case 16: - vs->send_hextile_tile = send_hextile_tile_generic_16; + vs->hextile.send_tile = send_hextile_tile_generic_16; break; case 32: - vs->send_hextile_tile = send_hextile_tile_generic_32; + vs->hextile.send_tile = send_hextile_tile_generic_32; break; } } diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 870e215..dbde08d 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -120,7 +120,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h) int pixels = 0; int pix, left[3]; uint errors; - unsigned char *buf = vs->tight.buffer; + unsigned char *buf = vs->tight.tight.buffer; /* * If client is big-endian, color samples begin from the second @@ -187,7 +187,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h) int pixels = 0; \ int sample, sum, left[3]; \ uint errors; \ - unsigned char *buf = vs->tight.buffer; \ + unsigned char *buf = vs->tight.tight.buffer; \ \ endian = ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \ (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); \ @@ -267,8 +267,8 @@ static int tight_detect_smooth_image(VncState *vs, int w, int h) { uint errors; - int compression = vs->tight_compression; - int quality = vs->tight_quality; + int compression = vs->tight.compression; + int quality = vs->tight.quality; if (!vs->vd->lossy) { return 0; @@ -280,7 +280,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h) return 0; } - if (vs->tight_quality != -1) { + if (vs->tight.quality != -1) { if (w * h < VNC_TIGHT_JPEG_MIN_RECT_SIZE) { return 0; } @@ -291,9 +291,9 @@ tight_detect_smooth_image(VncState *vs, int w, int h) } if (vs->clientds.pf.bytes_per_pixel == 4) { - if (vs->tight_pixel24) { + if (vs->tight.pixel24) { errors = tight_detect_smooth_image24(vs, w, h); - if (vs->tight_quality != -1) { + if (vs->tight.quality != -1) { return (errors < tight_conf[quality].jpeg_threshold24); } return (errors < tight_conf[compression].gradient_threshold24); @@ -323,7 +323,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h) uint##bpp##_t c0, c1, ci; \ int i, n0, n1; \ \ - data = (uint##bpp##_t *)vs->tight.buffer; \ + data = (uint##bpp##_t *)vs->tight.tight.buffer; \ \ c0 = data[0]; \ i = 1; \ @@ -394,9 +394,9 @@ static int tight_fill_palette(VncState *vs, int x, int y, { int max; - max = count / tight_conf[vs->tight_compression].idx_max_colors_divisor; + max = count / tight_conf[vs->tight.compression].idx_max_colors_divisor; if (max < 2 && - count >= tight_conf[vs->tight_compression].mono_min_rect_size) { + count >= tight_conf[vs->tight.compression].mono_min_rect_size) { max = 2; } if (max >= 256) { @@ -528,7 +528,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) int x, y, c; buf32 = (uint32_t *)buf; - memset(vs->tight_gradient.buffer, 0, w * 3 * sizeof(int)); + memset(vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) == (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)) { @@ -546,7 +546,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) upper[c] = 0; here[c] = 0; } - prev = (int *)vs->tight_gradient.buffer; + prev = (int *)vs->tight.gradient.buffer; for (x = 0; x < w; x++) { pix32 = *buf32++; for (c = 0; c < 3; c++) { @@ -586,7 +586,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) int prediction; \ int x, y, c; \ \ - memset (vs->tight_gradient.buffer, 0, w * 3 * sizeof(int)); \ + memset (vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); \ \ endian = ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \ (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); \ @@ -603,7 +603,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) upper[c] = 0; \ here[c] = 0; \ } \ - prev = (int *)vs->tight_gradient.buffer; \ + prev = (int *)vs->tight.gradient.buffer; \ for (x = 0; x < w; x++) { \ pix = *buf; \ if (endian) { \ @@ -773,7 +773,7 @@ static void extend_solid_area(VncState *vs, int x, int y, int w, int h, static int tight_init_stream(VncState *vs, int stream_id, int level, int strategy) { - z_streamp zstream = &vs->tight_stream[stream_id]; + z_streamp zstream = &vs->tight.stream[stream_id]; if (zstream->opaque == NULL) { int err; @@ -791,15 +791,15 @@ static int tight_init_stream(VncState *vs, int stream_id, return -1; } - vs->tight_levels[stream_id] = level; + vs->tight.levels[stream_id] = level; zstream->opaque = vs; } - if (vs->tight_levels[stream_id] != level) { + if (vs->tight.levels[stream_id] != level) { if (deflateParams(zstream, level, strategy) != Z_OK) { return -1; } - vs->tight_levels[stream_id] = level; + vs->tight.levels[stream_id] = level; } return 0; } @@ -827,11 +827,11 @@ static void tight_send_compact_size(VncState *vs, size_t len) static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, int level, int strategy) { - z_streamp zstream = &vs->tight_stream[stream_id]; + z_streamp zstream = &vs->tight.stream[stream_id]; int previous_out; if (bytes < VNC_TIGHT_MIN_TO_COMPRESS) { - vnc_write(vs, vs->tight.buffer, vs->tight.offset); + vnc_write(vs, vs->tight.tight.buffer, vs->tight.tight.offset); return bytes; } @@ -840,13 +840,13 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, } /* reserve memory in output buffer */ - buffer_reserve(&vs->tight_zlib, bytes + 64); + buffer_reserve(&vs->tight.zlib, bytes + 64); /* set pointers */ - zstream->next_in = vs->tight.buffer; - zstream->avail_in = vs->tight.offset; - zstream->next_out = vs->tight_zlib.buffer + vs->tight_zlib.offset; - zstream->avail_out = vs->tight_zlib.capacity - vs->tight_zlib.offset; + zstream->next_in = vs->tight.tight.buffer; + zstream->avail_in = vs->tight.tight.offset; + zstream->next_out = vs->tight.zlib.buffer + vs->tight.zlib.offset; + zstream->avail_out = vs->tight.zlib.capacity - vs->tight.zlib.offset; zstream->data_type = Z_BINARY; previous_out = zstream->total_out; @@ -856,13 +856,13 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, return -1; } - vs->tight_zlib.offset = vs->tight_zlib.capacity - zstream->avail_out; + vs->tight.zlib.offset = vs->tight.zlib.capacity - zstream->avail_out; bytes = zstream->total_out - previous_out; tight_send_compact_size(vs, bytes); - vnc_write(vs, vs->tight_zlib.buffer, bytes); + vnc_write(vs, vs->tight.zlib.buffer, bytes); - buffer_reset(&vs->tight_zlib); + buffer_reset(&vs->tight.zlib); return bytes; } @@ -914,15 +914,15 @@ static int send_full_color_rect(VncState *vs, int x, int y, int w, int h) vnc_write_u8(vs, stream << 4); /* no flushing, no filter */ - if (vs->tight_pixel24) { - tight_pack24(vs, vs->tight.buffer, w * h, &vs->tight.offset); + if (vs->tight.pixel24) { + tight_pack24(vs, vs->tight.tight.buffer, w * h, &vs->tight.tight.offset); bytes = 3; } else { bytes = vs->clientds.pf.bytes_per_pixel; } bytes = tight_compress_data(vs, stream, w * h * bytes, - tight_conf[vs->tight_compression].raw_zlib_level, + tight_conf[vs->tight.compression].raw_zlib_level, Z_DEFAULT_STRATEGY); return (bytes >= 0); @@ -934,14 +934,14 @@ static int send_solid_rect(VncState *vs) vnc_write_u8(vs, VNC_TIGHT_FILL << 4); /* no flushing, no filter */ - if (vs->tight_pixel24) { - tight_pack24(vs, vs->tight.buffer, 1, &vs->tight.offset); + if (vs->tight.pixel24) { + tight_pack24(vs, vs->tight.tight.buffer, 1, &vs->tight.tight.offset); bytes = 3; } else { bytes = vs->clientds.pf.bytes_per_pixel; } - vnc_write(vs, vs->tight.buffer, bytes); + vnc_write(vs, vs->tight.tight.buffer, bytes); return 1; } @@ -950,7 +950,7 @@ static int send_mono_rect(VncState *vs, int x, int y, { size_t bytes; int stream = 1; - int level = tight_conf[vs->tight_compression].mono_zlib_level; + int level = tight_conf[vs->tight.compression].mono_zlib_level; #ifdef CONFIG_VNC_PNG if (tight_can_send_png_rect(vs, w, h)) { @@ -978,26 +978,26 @@ static int send_mono_rect(VncState *vs, int x, int y, uint32_t buf[2] = {bg, fg}; size_t ret = sizeof (buf); - if (vs->tight_pixel24) { + if (vs->tight.pixel24) { tight_pack24(vs, (unsigned char*)buf, 2, &ret); } vnc_write(vs, buf, ret); - tight_encode_mono_rect32(vs->tight.buffer, w, h, bg, fg); + tight_encode_mono_rect32(vs->tight.tight.buffer, w, h, bg, fg); break; } case 2: vnc_write(vs, &bg, 2); vnc_write(vs, &fg, 2); - tight_encode_mono_rect16(vs->tight.buffer, w, h, bg, fg); + tight_encode_mono_rect16(vs->tight.tight.buffer, w, h, bg, fg); break; default: vnc_write_u8(vs, bg); vnc_write_u8(vs, fg); - tight_encode_mono_rect8(vs->tight.buffer, w, h, bg, fg); + tight_encode_mono_rect8(vs->tight.tight.buffer, w, h, bg, fg); break; } - vs->tight.offset = bytes; + vs->tight.tight.offset = bytes; bytes = tight_compress_data(vs, stream, bytes, level, Z_DEFAULT_STRATEGY); return (bytes >= 0); @@ -1027,7 +1027,7 @@ static void write_palette(int idx, uint32_t color, void *opaque) static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h) { int stream = 3; - int level = tight_conf[vs->tight_compression].gradient_zlib_level; + int level = tight_conf[vs->tight.compression].gradient_zlib_level; size_t bytes; if (vs->clientds.pf.bytes_per_pixel == 1) @@ -1036,23 +1036,23 @@ static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h) vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4); vnc_write_u8(vs, VNC_TIGHT_FILTER_GRADIENT); - buffer_reserve(&vs->tight_gradient, w * 3 * sizeof (int)); + buffer_reserve(&vs->tight.gradient, w * 3 * sizeof (int)); - if (vs->tight_pixel24) { - tight_filter_gradient24(vs, vs->tight.buffer, w, h); + if (vs->tight.pixel24) { + tight_filter_gradient24(vs, vs->tight.tight.buffer, w, h); bytes = 3; } else if (vs->clientds.pf.bytes_per_pixel == 4) { - tight_filter_gradient32(vs, (uint32_t *)vs->tight.buffer, w, h); + tight_filter_gradient32(vs, (uint32_t *)vs->tight.tight.buffer, w, h); bytes = 4; } else { - tight_filter_gradient16(vs, (uint16_t *)vs->tight.buffer, w, h); + tight_filter_gradient16(vs, (uint16_t *)vs->tight.tight.buffer, w, h); bytes = 2; } - buffer_reset(&vs->tight_gradient); + buffer_reset(&vs->tight.gradient); bytes = w * h * bytes; - vs->tight.offset = bytes; + vs->tight.tight.offset = bytes; bytes = tight_compress_data(vs, stream, bytes, level, Z_FILTERED); @@ -1063,7 +1063,7 @@ static int send_palette_rect(VncState *vs, int x, int y, int w, int h, VncPalette *palette) { int stream = 2; - int level = tight_conf[vs->tight_compression].idx_zlib_level; + int level = tight_conf[vs->tight.compression].idx_zlib_level; int colors; size_t bytes; @@ -1090,12 +1090,12 @@ static int send_palette_rect(VncState *vs, int x, int y, palette_iter(palette, write_palette, &priv); vnc_write(vs, header, sizeof(header)); - if (vs->tight_pixel24) { + if (vs->tight.pixel24) { tight_pack24(vs, vs->output.buffer + old_offset, colors, &offset); vs->output.offset = old_offset + offset; } - tight_encode_indexed_rect32(vs->tight.buffer, w * h, palette); + tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette); break; } case 2: @@ -1105,7 +1105,7 @@ static int send_palette_rect(VncState *vs, int x, int y, palette_iter(palette, write_palette, &priv); vnc_write(vs, header, sizeof(header)); - tight_encode_indexed_rect16(vs->tight.buffer, w * h, palette); + tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette); break; } default: @@ -1113,7 +1113,7 @@ static int send_palette_rect(VncState *vs, int x, int y, break; } bytes = w * h; - vs->tight.offset = bytes; + vs->tight.tight.offset = bytes; bytes = tight_compress_data(vs, stream, bytes, level, Z_DEFAULT_STRATEGY); @@ -1179,7 +1179,7 @@ DEFINE_RGB_GET_ROW_FUNCTION(32) static void rgb_prepare_row(VncState *vs, uint8_t *dst, int x, int y, int count) { - if (vs->tight_pixel24) + if (vs->tight.pixel24) rgb_prepare_row24(vs, dst, x, y, count); else if (ds_get_bytes_per_pixel(vs->ds) == 4) rgb_prepare_row32(vs, dst, x, y, count); @@ -1200,7 +1200,7 @@ static void rgb_prepare_row(VncState *vs, uint8_t *dst, int x, int y, static void jpeg_init_destination(j_compress_ptr cinfo) { VncState *vs = cinfo->client_data; - Buffer *buffer = &vs->tight_jpeg; + Buffer *buffer = &vs->tight.jpeg; cinfo->dest->next_output_byte = (JOCTET *)buffer->buffer + buffer->offset; cinfo->dest->free_in_buffer = (size_t)(buffer->capacity - buffer->offset); @@ -1210,7 +1210,7 @@ static void jpeg_init_destination(j_compress_ptr cinfo) static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo) { VncState *vs = cinfo->client_data; - Buffer *buffer = &vs->tight_jpeg; + Buffer *buffer = &vs->tight.jpeg; buffer->offset = buffer->capacity; buffer_reserve(buffer, 2048); @@ -1222,7 +1222,7 @@ static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo) static void jpeg_term_destination(j_compress_ptr cinfo) { VncState *vs = cinfo->client_data; - Buffer *buffer = &vs->tight_jpeg; + Buffer *buffer = &vs->tight.jpeg; buffer->offset = buffer->capacity - cinfo->dest->free_in_buffer; } @@ -1239,7 +1239,7 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) if (ds_get_bytes_per_pixel(vs->ds) == 1) return send_full_color_rect(vs, x, y, w, h); - buffer_reserve(&vs->tight_jpeg, 2048); + buffer_reserve(&vs->tight.jpeg, 2048); cinfo.err = jpeg_std_error(&jerr); jpeg_create_compress(&cinfo); @@ -1273,9 +1273,9 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) vnc_write_u8(vs, VNC_TIGHT_JPEG << 4); - tight_send_compact_size(vs, vs->tight_jpeg.offset); - vnc_write(vs, vs->tight_jpeg.buffer, vs->tight_jpeg.offset); - buffer_reset(&vs->tight_jpeg); + tight_send_compact_size(vs, vs->tight.jpeg.offset); + vnc_write(vs, vs->tight.jpeg.buffer, vs->tight.jpeg.offset); + buffer_reset(&vs->tight.jpeg); return 1; } @@ -1291,7 +1291,7 @@ static void write_png_palette(int idx, uint32_t pix, void *opaque) VncState *vs = priv->vs; png_colorp color = &priv->png_palette[idx]; - if (vs->tight_pixel24) + if (vs->tight.pixel24) { color->red = (pix >> vs->clientds.pf.rshift) & vs->clientds.pf.rmax; color->green = (pix >> vs->clientds.pf.gshift) & vs->clientds.pf.gmax; @@ -1318,10 +1318,10 @@ static void png_write_data(png_structp png_ptr, png_bytep data, { VncState *vs = png_get_io_ptr(png_ptr); - buffer_reserve(&vs->tight_png, vs->tight_png.offset + length); - memcpy(vs->tight_png.buffer + vs->tight_png.offset, data, length); + buffer_reserve(&vs->tight.png, vs->tight.png.offset + length); + memcpy(vs->tight.png.buffer + vs->tight.png.offset, data, length); - vs->tight_png.offset += length; + vs->tight.png.offset += length; } static void png_flush_data(png_structp png_ptr) @@ -1346,8 +1346,8 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, png_infop info_ptr; png_colorp png_palette = NULL; size_t offset; - int level = tight_png_conf[vs->tight_compression].png_zlib_level; - int filters = tight_png_conf[vs->tight_compression].png_filters; + int level = tight_png_conf[vs->tight.compression].png_zlib_level; + int filters = tight_png_conf[vs->tight.compression].png_filters; uint8_t *buf; int dy; @@ -1390,22 +1390,22 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, png_set_PLTE(png_ptr, info_ptr, png_palette, palette_size(palette)); - offset = vs->tight.offset; + offset = vs->tight.tight.offset; if (vs->clientds.pf.bytes_per_pixel == 4) { - tight_encode_indexed_rect32(vs->tight.buffer, w * h, palette); + tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette); } else { - tight_encode_indexed_rect16(vs->tight.buffer, w * h, palette); + tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette); } } png_write_info(png_ptr, info_ptr); - buffer_reserve(&vs->tight_png, 2048); + buffer_reserve(&vs->tight.png, 2048); buf = qemu_malloc(w * 3); for (dy = 0; dy < h; dy++) { if (color_type == PNG_COLOR_TYPE_PALETTE) { - memcpy(buf, vs->tight.buffer + (dy * w), w); + memcpy(buf, vs->tight.tight.buffer + (dy * w), w); } else { rgb_prepare_row(vs, buf, x, y + dy, w); } @@ -1423,27 +1423,27 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, vnc_write_u8(vs, VNC_TIGHT_PNG << 4); - tight_send_compact_size(vs, vs->tight_png.offset); - vnc_write(vs, vs->tight_png.buffer, vs->tight_png.offset); - buffer_reset(&vs->tight_png); + tight_send_compact_size(vs, vs->tight.png.offset); + vnc_write(vs, vs->tight.png.buffer, vs->tight.png.offset); + buffer_reset(&vs->tight.png); return 1; } #endif /* CONFIG_VNC_PNG */ static void vnc_tight_start(VncState *vs) { - buffer_reset(&vs->tight); + buffer_reset(&vs->tight.tight); // make the output buffer be the zlib buffer, so we can compress it later - vs->tight_tmp = vs->output; - vs->output = vs->tight; + vs->tight.tmp = vs->output; + vs->output = vs->tight.tight; } static void vnc_tight_stop(VncState *vs) { // switch back to normal output/zlib buffers - vs->tight = vs->output; - vs->output = vs->tight_tmp; + vs->tight.tight = vs->output; + vs->output = vs->tight.tmp; } static int send_sub_rect(VncState *vs, int x, int y, int w, int h) @@ -1463,11 +1463,11 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) if (colors == 0) { if (tight_detect_smooth_image(vs, w, h)) { - if (vs->tight_quality == -1) { + if (vs->tight.quality == -1) { ret = send_gradient_rect(vs, x, y, w, h); } else { #ifdef CONFIG_VNC_JPEG - int quality = tight_conf[vs->tight_quality].jpeg_quality; + int quality = tight_conf[vs->tight.quality].jpeg_quality; ret = send_jpeg_rect(vs, x, y, w, h, quality); #else @@ -1483,9 +1483,9 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) ret = send_mono_rect(vs, x, y, w, h, bg, fg); } else if (colors <= 256) { #ifdef CONFIG_VNC_JPEG - if (colors > 96 && vs->tight_quality != -1 && vs->tight_quality <= 3 && + if (colors > 96 && vs->tight.quality != -1 && vs->tight.quality <= 3 && tight_detect_smooth_image(vs, w, h)) { - int quality = tight_conf[vs->tight_quality].jpeg_quality; + int quality = tight_conf[vs->tight.quality].jpeg_quality; ret = send_jpeg_rect(vs, x, y, w, h, quality); } else { @@ -1518,8 +1518,8 @@ static int send_rect_simple(VncState *vs, int x, int y, int w, int h) int rw, rh; int n = 0; - max_size = tight_conf[vs->tight_compression].max_rect_size; - max_width = tight_conf[vs->tight_compression].max_rect_width; + max_size = tight_conf[vs->tight.compression].max_rect_size; + max_width = tight_conf[vs->tight.compression].max_rect_width; if (w > max_width || w * h > max_size) { max_sub_width = (w > max_width) ? max_width : w; @@ -1628,9 +1628,9 @@ int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, if (vs->clientds.pf.bytes_per_pixel == 4 && vs->clientds.pf.rmax == 0xFF && vs->clientds.pf.bmax == 0xFF && vs->clientds.pf.gmax == 0xFF) { - vs->tight_pixel24 = true; + vs->tight.pixel24 = true; } else { - vs->tight_pixel24 = false; + vs->tight.pixel24 = false; } if (w * h < VNC_TIGHT_MIN_SPLIT_RECT_SIZE) @@ -1638,8 +1638,8 @@ int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, /* Calculate maximum number of rows in one non-solid rectangle. */ - max_rows = tight_conf[vs->tight_compression].max_rect_size; - max_rows /= MIN(tight_conf[vs->tight_compression].max_rect_width, w); + max_rows = tight_conf[vs->tight.compression].max_rect_size; + max_rows /= MIN(tight_conf[vs->tight.compression].max_rect_width, w); return find_large_solid_color_rect(vs, x, y, w, h, max_rows); } @@ -1647,16 +1647,16 @@ int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, void vnc_tight_clear(VncState *vs) { int i; - for (i=0; itight_stream); i++) { - if (vs->tight_stream[i].opaque) { - deflateEnd(&vs->tight_stream[i]); + for (i=0; itight.stream); i++) { + if (vs->tight.stream[i].opaque) { + deflateEnd(&vs->tight.stream[i]); } } - buffer_free(&vs->tight); - buffer_free(&vs->tight_zlib); - buffer_free(&vs->tight_gradient); + buffer_free(&vs->tight.tight); + buffer_free(&vs->tight.zlib); + buffer_free(&vs->tight.gradient); #ifdef CONFIG_VNC_JPEG - buffer_free(&vs->tight_jpeg); + buffer_free(&vs->tight.jpeg); #endif } diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c index a99bc38..3c6e6ab 100644 --- a/ui/vnc-enc-zlib.c +++ b/ui/vnc-enc-zlib.c @@ -47,21 +47,21 @@ void vnc_zlib_zfree(void *x, void *addr) static void vnc_zlib_start(VncState *vs) { - buffer_reset(&vs->zlib); + buffer_reset(&vs->zlib.zlib); // make the output buffer be the zlib buffer, so we can compress it later - vs->zlib_tmp = vs->output; - vs->output = vs->zlib; + vs->zlib.tmp = vs->output; + vs->output = vs->zlib.zlib; } static int vnc_zlib_stop(VncState *vs) { - z_streamp zstream = &vs->zlib_stream; + z_streamp zstream = &vs->zlib.stream; int previous_out; // switch back to normal output/zlib buffers - vs->zlib = vs->output; - vs->output = vs->zlib_tmp; + vs->zlib.zlib = vs->output; + vs->output = vs->zlib.tmp; // compress the zlib buffer @@ -75,7 +75,7 @@ static int vnc_zlib_stop(VncState *vs) zstream->zalloc = vnc_zlib_zalloc; zstream->zfree = vnc_zlib_zfree; - err = deflateInit2(zstream, vs->tight_compression, Z_DEFLATED, MAX_WBITS, + err = deflateInit2(zstream, vs->tight.compression, Z_DEFLATED, MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); if (err != Z_OK) { @@ -83,24 +83,24 @@ static int vnc_zlib_stop(VncState *vs) return -1; } - vs->zlib_level = vs->tight_compression; + vs->zlib.level = vs->tight.compression; zstream->opaque = vs; } - if (vs->tight_compression != vs->zlib_level) { - if (deflateParams(zstream, vs->tight_compression, + 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; + vs->zlib.level = vs->tight.compression; } // reserve memory in output buffer - buffer_reserve(&vs->output, vs->zlib.offset + 64); + buffer_reserve(&vs->output, vs->zlib.zlib.offset + 64); // set pointers - zstream->next_in = vs->zlib.buffer; - zstream->avail_in = vs->zlib.offset; + zstream->next_in = vs->zlib.zlib.buffer; + zstream->avail_in = vs->zlib.zlib.offset; zstream->next_out = vs->output.buffer + vs->output.offset; zstream->avail_out = vs->output.capacity - vs->output.offset; zstream->data_type = Z_BINARY; @@ -145,8 +145,8 @@ int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) void vnc_zlib_clear(VncState *vs) { - if (vs->zlib_stream.opaque) { - deflateEnd(&vs->zlib_stream); + if (vs->zlib.stream.opaque) { + deflateEnd(&vs->zlib.stream); } - buffer_free(&vs->zlib); + buffer_free(&vs->zlib.zlib); } diff --git a/ui/vnc.c b/ui/vnc.c index d87a1bf..4f129b4 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1640,8 +1640,8 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vs->features = 0; vs->vnc_encoding = 0; - vs->tight_compression = 9; - vs->tight_quality = -1; /* Lossless by default */ + vs->tight.compression = 9; + vs->tight.quality = -1; /* Lossless by default */ vs->absolute = -1; /* @@ -1693,10 +1693,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vs->features |= VNC_FEATURE_WMVI_MASK; break; case VNC_ENCODING_COMPRESSLEVEL0 ... VNC_ENCODING_COMPRESSLEVEL0 + 9: - vs->tight_compression = (enc & 0x0F); + vs->tight.compression = (enc & 0x0F); break; case VNC_ENCODING_QUALITYLEVEL0 ... VNC_ENCODING_QUALITYLEVEL0 + 9: - vs->tight_quality = (enc & 0x0F); + vs->tight.quality = (enc & 0x0F); break; default: VNC_DEBUG("Unknown encoding: %d (0x%.8x): %d\n", i, enc, enc); diff --git a/ui/vnc.h b/ui/vnc.h index f69a1e3..7bb6971 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -122,6 +122,35 @@ struct VncDisplay #endif }; +typedef struct VncTight { + uint8_t quality; + uint8_t compression; + uint8_t pixel24; + Buffer tight; + Buffer tmp; + Buffer zlib; + Buffer gradient; +#ifdef CONFIG_VNC_JPEG + Buffer jpeg; +#endif +#ifdef CONFIG_VNC_PNG + Buffer png; +#endif + int levels[4]; + z_stream stream[4]; +} VncTight; + +typedef struct VncHextile { + VncSendHextileTile *send_tile; +} VncHextile; + +typedef struct VncZlib { + Buffer zlib; + Buffer tmp; + z_stream stream; + int level; +} VncZlib; + struct VncState { int csock; @@ -170,32 +199,9 @@ struct VncState QEMUPutLEDEntry *led; /* Encoding specific */ - - /* Tight */ - uint8_t tight_quality; - uint8_t tight_compression; - uint8_t tight_pixel24; - Buffer tight; - Buffer tight_tmp; - Buffer tight_zlib; - Buffer tight_gradient; -#ifdef CONFIG_VNC_JPEG - Buffer tight_jpeg; -#endif -#ifdef CONFIG_VNC_PNG - Buffer tight_png; -#endif - int tight_levels[4]; - z_stream tight_stream[4]; - - /* Hextile */ - VncSendHextileTile *send_hextile_tile; - - /* Zlib */ - Buffer zlib; - Buffer zlib_tmp; - z_stream zlib_stream; - int zlib_level; + VncTight tight; + VncZlib zlib; + VncHextile hextile; Notifier mouse_mode_notifier;