From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9UoQ-0001tH-NV for qemu-devel@nongnu.org; Thu, 06 Sep 2012 01:39:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9UoP-000572-N6 for qemu-devel@nongnu.org; Thu, 06 Sep 2012 01:39:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9UoP-00056m-F2 for qemu-devel@nongnu.org; Thu, 06 Sep 2012 01:39:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q865dWRV018112 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 Sep 2012 01:39:32 -0400 From: Gerd Hoffmann Date: Thu, 6 Sep 2012 07:39:27 +0200 Message-Id: <1346909967-10929-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1346909967-10929-1-git-send-email-kraxel@redhat.com> References: <1346909967-10929-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] spice: send updates only for changed screen content List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann when creating screen updates go compare the current guest screen against the mirror (which holds the most recent update sent), then only create updates for the screen areas which did actually change. [ v2: drop redundant qemu_spice_create_one_update call ] Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index 973cd53..d062765 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -239,6 +239,13 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd, static void qemu_spice_create_update(SimpleSpiceDisplay *ssd) { + static const int blksize = 32; + int blocks = (ds_get_width(ssd->ds) + blksize - 1) / blksize; + int dirty_top[blocks]; + int y, yoff, x, xoff, blk, bw; + int bpp = ds_get_bytes_per_pixel(ssd->ds); + uint8_t *guest, *mirror; + if (qemu_spice_rect_is_empty(&ssd->dirty)) { return; }; @@ -253,7 +260,54 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd) ssd->ds_mirror = g_malloc0(size); } - qemu_spice_create_one_update(ssd, &ssd->dirty); + for (blk = 0; blk < blocks; blk++) { + dirty_top[blk] = -1; + } + + guest = ds_get_data(ssd->ds); + mirror = ssd->ds_mirror; + for (y = ssd->dirty.top; y < ssd->dirty.bottom; y++) { + yoff = y * ds_get_linesize(ssd->ds); + for (x = ssd->dirty.left; x < ssd->dirty.right; x += blksize) { + xoff = x * bpp; + blk = x / blksize; + bw = MIN(blksize, ssd->dirty.right - x); + if (memcmp(guest + yoff + xoff, + mirror + yoff + xoff, + bw * bpp) == 0) { + if (dirty_top[blk] != -1) { + QXLRect update = { + .top = dirty_top[blk], + .bottom = y, + .left = x, + .right = x + bw, + }; + qemu_spice_create_one_update(ssd, &update); + dirty_top[blk] = -1; + } + } else { + if (dirty_top[blk] == -1) { + dirty_top[blk] = y; + } + } + } + } + + for (x = ssd->dirty.left; x < ssd->dirty.right; x += blksize) { + blk = x / blksize; + bw = MIN(blksize, ssd->dirty.right - x); + if (dirty_top[blk] != -1) { + QXLRect update = { + .top = dirty_top[blk], + .bottom = ssd->dirty.bottom, + .left = x, + .right = x + bw, + }; + qemu_spice_create_one_update(ssd, &update); + dirty_top[blk] = -1; + } + } + memset(&ssd->dirty, 0, sizeof(ssd->dirty)); } -- 1.7.1