diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2010-07-07 20:57:57 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-26 17:36:14 -0500 |
| commit | 3941bf6fb1c98a39bf8a0cfb4feacaef2a23d0db (patch) | |
| tree | d87e2e6c483687a3fd32949c894a9b7b6543de92 /ui/vnc-enc-tight.c | |
| parent | efe556adb75a20ab71f3e5b1c5b19bf045e7953f (diff) | |
| download | qemu-3941bf6fb1c98a39bf8a0cfb4feacaef2a23d0db.tar.gz | |
vnc: tight: specific zlib level and filters for each compression level
Disable png filters for lower compression levels. This should lower
the CPU consumption and reduce encoding time.
This isn't in tight_conf because:
* tight_conf structure must not change, because it's shared with other
tight implementations (libvncserver, etc..).
* it'd exceed the 80 col limit.
* PNG_ macros are only defined if CONFIG_VNC_PNG is defined
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/vnc-enc-tight.c')
| -rw-r--r-- | ui/vnc-enc-tight.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index cc57c26796..e627e00dff 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -73,6 +73,21 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); #ifdef CONFIG_VNC_PNG +static const struct { + int png_zlib_level, png_filters; +} tight_png_conf[] = { + { 0, PNG_NO_FILTERS }, + { 1, PNG_NO_FILTERS }, + { 2, PNG_NO_FILTERS }, + { 3, PNG_NO_FILTERS }, + { 4, PNG_NO_FILTERS }, + { 5, PNG_ALL_FILTERS }, + { 6, PNG_ALL_FILTERS }, + { 7, PNG_ALL_FILTERS }, + { 8, PNG_ALL_FILTERS }, + { 9, PNG_ALL_FILTERS }, +}; + static int send_png_rect(VncState *vs, int x, int y, int w, int h, QDict *palette); @@ -1425,7 +1440,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_conf[vs->tight_compression].raw_zlib_level; + 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; @@ -1444,6 +1460,7 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, png_set_write_fn(png_ptr, (void *) vs, png_write_data, png_flush_data); png_set_compression_level(png_ptr, level); + png_set_filter(png_ptr, PNG_FILTER_TYPE_DEFAULT, filters); if (palette) { color_type = PNG_COLOR_TYPE_PALETTE; |