From 03817eb874f2f39bdc81deecf986c9d3a6bc5085 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Wed, 7 Jul 2010 20:58:05 +0200 Subject: vnc: tight: split send_sub_rect Split send_sub_rect in send_sub_rect_jpeg and send_sub_rect_nojpeg to remove all these #ifdef CONFIG_JPEG. Signed-off-by: Corentin Chary Signed-off-by: Anthony Liguori --- ui/vnc-enc-tight.c | 80 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 25 deletions(-) (limited to 'ui/vnc-enc-tight.c') diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index eaa88cef9a..86bb49a16f 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -1452,34 +1452,39 @@ static void vnc_tight_stop(VncState *vs) vs->output = vs->tight.tmp; } -static int send_sub_rect(VncState *vs, int x, int y, int w, int h) +static int send_sub_rect_nojpeg(VncState *vs, int x, int y, int w, int h, + int bg, int fg, int colors, VncPalette *palette) { - VncPalette *palette = NULL; - uint32_t bg = 0, fg = 0; - int colors; - int ret = 0; - - vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type); + int ret; - vnc_tight_start(vs); - vnc_raw_send_framebuffer_update(vs, x, y, w, h); - vnc_tight_stop(vs); + if (colors == 0) { + if (tight_detect_smooth_image(vs, w, h)) { + ret = send_gradient_rect(vs, x, y, w, h); + } else { + ret = send_full_color_rect(vs, x, y, w, h); + } + } else if (colors == 1) { + ret = send_solid_rect(vs); + } else if (colors == 2) { + ret = send_mono_rect(vs, x, y, w, h, bg, fg); + } else if (colors <= 256) { + ret = send_palette_rect(vs, x, y, w, h, palette); + } + return ret; +} - colors = tight_fill_palette(vs, x, y, w * h, &fg, &bg, &palette); +#ifdef CONFIG_VNC_JPEG +static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h, + int bg, int fg, int colors, + VncPalette *palette) +{ + int ret; if (colors == 0) { if (tight_detect_smooth_image(vs, w, h)) { - 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 - ret = send_full_color_rect(vs, x, y, w, h); -#endif - } + ret = send_jpeg_rect(vs, x, y, w, h, quality); } else { ret = send_full_color_rect(vs, x, y, w, h); } @@ -1488,8 +1493,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) } else if (colors == 2) { 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 && tight_detect_smooth_image(vs, w, h)) { int quality = tight_conf[vs->tight.quality].jpeg_quality; @@ -1497,10 +1501,36 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) } else { ret = send_palette_rect(vs, x, y, w, h, palette); } -#else - ret = send_palette_rect(vs, x, y, w, h, palette); + } + return ret; +} #endif + +static int send_sub_rect(VncState *vs, int x, int y, int w, int h) +{ + VncPalette *palette = NULL; + uint32_t bg = 0, fg = 0; + int colors; + int ret = 0; + + vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type); + + vnc_tight_start(vs); + vnc_raw_send_framebuffer_update(vs, x, y, w, h); + vnc_tight_stop(vs); + + colors = tight_fill_palette(vs, x, y, w * h, &fg, &bg, &palette); + +#ifdef CONFIG_VNC_JPEG + if (vs->tight.quality != -1) { + ret = send_sub_rect_jpeg(vs, x, y, w, h, bg, fg, colors, palette); + } else { + ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette); } +#else + ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette); +#endif + palette_destroy(palette); return ret; } -- cgit v1.2.1