From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPR-00009z-SA for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtYPN-0003xi-HU for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPN-0003xb-Br for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:41 -0500 From: Gerd Hoffmann Date: Tue, 3 Nov 2015 11:01:30 +0100 Message-Id: <1446544891-3600-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1446544891-3600-1-git-send-email-kraxel@redhat.com> References: <1446544891-3600-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 5/6] vnc: allow fall back to RAW encoding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven , Gerd Hoffmann From: Peter Lieven I have observed that depending on the contents and the encoding it happens that sending data as RAW sometimes would take less space than the encoded data. This is especially the case for small updates or areas with high color images. If sending RAW encoded data is beneficial allow a fall back to RAW encoding for the framebuffer update. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 7b37e3b..166d1b5 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -840,6 +840,8 @@ int vnc_raw_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) { int n = 0; + bool encode_raw = false; + size_t saved_offs = vs->output.offset; switch(vs->vnc_encoding) { case VNC_ENCODING_ZLIB: @@ -862,10 +864,24 @@ int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) n = vnc_zywrle_send_framebuffer_update(vs, x, y, w, h); break; default: - vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_RAW); - n = vnc_raw_send_framebuffer_update(vs, x, y, w, h); + encode_raw = true; break; } + + /* If the client has the same pixel format as our internal buffer and + * a RAW encoding would need less space fall back to RAW encoding to + * save bandwidth and processing power in the client. */ + if (!encode_raw && vs->write_pixels == vnc_write_pixels_copy && + 12 + h * w * VNC_SERVER_FB_BYTES <= (vs->output.offset - saved_offs)) { + vs->output.offset = saved_offs; + encode_raw = true; + } + + if (encode_raw) { + vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_RAW); + n = vnc_raw_send_framebuffer_update(vs, x, y, w, h); + } + return n; } -- 1.8.3.1