Patchwork [16/16] vnc: tight: don't limit png rect size

login
register
mail settings
Submitter Corentin Chary
Date June 16, 2010, 7:12 a.m.
Message ID <1276672333-14831-17-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/55856/
State New
Headers show

Comments

Corentin Chary - June 16, 2010, 7:12 a.m.
PNG was introduced because some vnc HTML5 clients like noVNC
have slow zlib decoding, but really fast PNG rendering. This
means that if PNG is enabled we should send only PNG (and JPEG, fill),
and never something compressed directly with zlib.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 ui/vnc-enc-tight.c |    4 ----
 ui/vnc-enc-tight.h |    1 -
 2 files changed, 0 insertions(+), 5 deletions(-)

Patch

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 1d926c9..e171074 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -97,10 +97,6 @@  static bool tight_can_send_png_rect(VncState *vs, int w, int h)
         vs->clientds.pf.bytes_per_pixel == 1) {
         return false;
     }
-
-    if (w * h < VNC_TIGHT_PNG_MIN_RECT_SIZE) {
-        return false;
-    }
     return true;
 }
 #endif
diff --git a/ui/vnc-enc-tight.h b/ui/vnc-enc-tight.h
index dc7150a..a3add78 100644
--- a/ui/vnc-enc-tight.h
+++ b/ui/vnc-enc-tight.h
@@ -176,7 +176,6 @@ 
 #define VNC_TIGHT_MAX_SPLIT_TILE_SIZE       16
 
 #define VNC_TIGHT_JPEG_MIN_RECT_SIZE      4096
-#define VNC_TIGHT_PNG_MIN_RECT_SIZE       4096
 #define VNC_TIGHT_DETECT_SUBROW_WIDTH        7
 #define VNC_TIGHT_DETECT_MIN_WIDTH           8
 #define VNC_TIGHT_DETECT_MIN_HEIGHT          8