From: Peter Lieven <pl@kamp.de>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, pbonzini@redhat.com,
mst@redhat.com, dgilbert@redhat.com, peter.maydell@linaro.org,
kraxel@redhat.com, Peter Lieven <pl@kamp.de>
Subject: [Qemu-devel] [PATCH 14/15] vnc-tight: make the encoding palette static
Date: Tue, 28 Jun 2016 11:01:38 +0200 [thread overview]
Message-ID: <1467104499-27517-15-git-send-email-pl@kamp.de> (raw)
In-Reply-To: <1467104499-27517-1-git-send-email-pl@kamp.de>
for the calculation of number of subcolors of each subrect a new palette was allocated,
memset to zero and then destroyed. Use a static palette for this instead.
Signed-off-by: Peter Lieven <pl@kamp.de>
---
ui/vnc-enc-tight.c | 21 ++++++++++-----------
ui/vnc.h | 1 +
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index e5cba0e..d3a9cc5 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -349,7 +349,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
tight_fill_palette##bpp(VncState *vs, int x, int y, \
int max, size_t count, \
uint32_t *bg, uint32_t *fg, \
- VncPalette **palette) { \
+ VncPalette *palette) { \
uint##bpp##_t *data; \
uint##bpp##_t c0, c1, ci; \
int i, n0, n1; \
@@ -396,23 +396,23 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
return 0; \
} \
\
- *palette = palette_new(max, bpp); \
- palette_put(*palette, c0); \
- palette_put(*palette, c1); \
- palette_put(*palette, ci); \
+ palette_init(palette, max, bpp); \
+ palette_put(palette, c0); \
+ palette_put(palette, c1); \
+ palette_put(palette, ci); \
\
for (i++; i < count; i++) { \
if (data[i] == ci) { \
continue; \
} else { \
ci = data[i]; \
- if (!palette_put(*palette, (uint32_t)ci)) { \
+ if (!palette_put(palette, (uint32_t)ci)) { \
return 0; \
} \
} \
} \
\
- return palette_size(*palette); \
+ return palette_size(palette); \
}
DEFINE_FILL_PALETTE_FUNCTION(8)
@@ -421,7 +421,7 @@ DEFINE_FILL_PALETTE_FUNCTION(32)
static int tight_fill_palette(VncState *vs, int x, int y,
size_t count, uint32_t *bg, uint32_t *fg,
- VncPalette **palette)
+ VncPalette *palette)
{
int max;
@@ -1459,7 +1459,7 @@ static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h,
static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
{
- VncPalette *palette = NULL;
+ VncPalette *palette = &vs->tight.palette;
uint32_t bg = 0, fg = 0;
int colors;
int ret = 0;
@@ -1488,7 +1488,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
}
#endif
- colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, &palette);
+ colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, palette);
#ifdef CONFIG_VNC_JPEG
if (allow_jpeg && vs->tight.quality != (uint8_t)-1) {
@@ -1501,7 +1501,6 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette);
#endif
- palette_destroy(palette);
return ret;
}
diff --git a/ui/vnc.h b/ui/vnc.h
index 6568bca..e24e2cc 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -201,6 +201,7 @@ typedef struct VncTight {
#endif
int levels[4];
z_stream stream[4];
+ VncPalette palette;
} VncTight;
typedef struct VncHextile {
--
1.9.1
next prev parent reply other threads:[~2016-06-28 9:02 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 9:01 [Qemu-devel] [PATCH 00/15] optimize Qemu RSS usage Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 01/15] coroutine-ucontext: mmap stack memory Peter Lieven
2016-06-28 10:02 ` Peter Maydell
2016-06-28 10:21 ` Peter Lieven
2016-06-28 11:04 ` Paolo Bonzini
2016-06-28 9:01 ` [Qemu-devel] [PATCH 02/15] coroutine-ucontext: add a switch to monitor maximum stack size Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 03/15] coroutine-ucontext: reduce stack size to 64kB Peter Lieven
2016-06-28 10:54 ` Paolo Bonzini
2016-06-28 10:57 ` Dr. David Alan Gilbert
2016-06-28 11:17 ` Peter Lieven
2016-06-28 11:35 ` Dr. David Alan Gilbert
2016-06-28 12:09 ` Peter Lieven
2016-06-28 14:20 ` Dr. David Alan Gilbert
2016-06-30 6:34 ` Peter Lieven
2016-06-28 11:13 ` Peter Lieven
2016-06-28 11:26 ` Paolo Bonzini
2016-06-28 9:01 ` [Qemu-devel] [PATCH 04/15] coroutine: add a knob to disable the shared release pool Peter Lieven
2016-06-28 10:41 ` Paolo Bonzini
2016-06-28 10:47 ` Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 05/15] util: add a helper to mmap private anonymous memory Peter Lieven
2016-10-16 2:10 ` Michael S. Tsirkin
2016-10-18 13:50 ` Alex Bennée
2016-06-28 9:01 ` [Qemu-devel] [PATCH 06/15] exec: use mmap for subpages Peter Lieven
2016-06-28 10:48 ` Paolo Bonzini
2016-06-28 9:01 ` [Qemu-devel] [PATCH 07/15] qapi: use mmap for QmpInputVisitor Peter Lieven
2016-06-28 9:29 ` Dr. David Alan Gilbert
2016-06-28 9:39 ` Peter Lieven
2016-06-28 10:10 ` Daniel P. Berrange
2016-06-28 10:17 ` Dr. David Alan Gilbert
2016-06-28 10:21 ` Daniel P. Berrange
2016-06-28 14:10 ` Eric Blake
2016-06-28 11:36 ` Paolo Bonzini
2016-06-28 14:14 ` Eric Blake
2016-06-30 14:12 ` Markus Armbruster
2016-07-04 9:02 ` Paolo Bonzini
2016-07-04 11:18 ` Markus Armbruster
2016-07-04 11:36 ` Peter Lieven
2016-07-04 11:42 ` Paolo Bonzini
2016-06-28 9:01 ` [Qemu-devel] [PATCH 08/15] virtio: use mmap for VirtQueue Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 09/15] loader: use mmap for ROMs Peter Lieven
2016-06-28 10:41 ` Paolo Bonzini
2016-06-28 11:26 ` Peter Lieven
2016-07-04 7:30 ` Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 10/15] vmware_svga: use mmap for scratch pad Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 11/15] qom: use mmap for bigger Objects Peter Lieven
2016-06-28 10:08 ` Daniel P. Berrange
2016-06-28 10:10 ` Peter Maydell
2016-06-28 10:19 ` Peter Lieven
2016-06-28 10:42 ` Paolo Bonzini
2016-06-28 10:49 ` Peter Lieven
2016-06-30 14:15 ` Markus Armbruster
2016-06-28 9:01 ` [Qemu-devel] [PATCH 12/15] util: add a function to realloc mmapped memory Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 13/15] exec: use mmap for PhysPageMap->nodes Peter Lieven
2016-06-28 10:43 ` Paolo Bonzini
2016-06-28 10:48 ` Peter Lieven
2016-07-11 9:31 ` Peter Lieven
2016-07-11 9:44 ` Peter Lieven
2016-07-11 10:37 ` Paolo Bonzini
2016-07-12 14:34 ` Peter Lieven
2016-07-13 10:27 ` Paolo Bonzini
2016-07-14 14:47 ` Peter Lieven
2016-06-28 9:01 ` Peter Lieven [this message]
2016-06-28 11:12 ` [Qemu-devel] [PATCH 14/15] vnc-tight: make the encoding palette static Paolo Bonzini
2016-06-28 11:18 ` Peter Lieven
2016-06-28 9:01 ` [Qemu-devel] [PATCH 15/15] vnc: use mmap for VncState Peter Lieven
2016-06-28 11:37 ` [Qemu-devel] [PATCH 00/15] optimize Qemu RSS usage Paolo Bonzini
2016-06-28 12:14 ` Peter Lieven
2016-06-28 12:29 ` Paolo Bonzini
2016-06-28 12:33 ` Peter Lieven
2016-06-28 12:56 ` Paolo Bonzini
2016-06-28 12:56 ` Dr. David Alan Gilbert
2016-06-28 14:43 ` Peter Lieven
2016-06-28 14:52 ` Peter Lieven
2016-10-12 21:18 ` Michael R. Hines
2016-10-18 10:47 ` Peter Lieven
2016-10-19 17:40 ` Michael R. Hines
2016-10-31 22:00 ` Michael R. Hines
2016-11-01 22:02 ` Michael R. Hines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467104499-27517-15-git-send-email-pl@kamp.de \
--to=pl@kamp.de \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.