[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/15] vnc: add a non-adaptive option
From: |
Corentin Chary |
Subject: |
[Qemu-devel] [PATCH 15/15] vnc: add a non-adaptive option |
Date: |
Wed, 11 Aug 2010 07:49:45 +0200 |
This option allow to disable adaptive behaviors in some encodings.
Signed-off-by: Corentin Chary <address@hidden>
---
qemu-options.hx | 9 +++++++++
ui/vnc-enc-tight.c | 2 +-
ui/vnc.c | 13 +++++++++----
ui/vnc.h | 1 +
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 40cee70..e158101 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -842,6 +842,15 @@ option is set, VNC client may receive lossy framebuffer
updates
depending on its encoding settings. Enabling this option can save
a lot of bandwidth at the expense of quality.
address@hidden non-adaptive
+
+Disable adaptive encodings. Adaptive encodings are enabled by default.
+An adaptive encoding will try to detect frequently updated screen regions,
+and send updates in these regions using a lossy encoding (like JPEG).
+This can be really helpfull to save bandwidth when playing videos. Disabling
+adaptive encodings allow to restore the original static behavior of encodings
+like Tight.
+
@end table
ETEXI
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index b0181ff..534745e 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -1546,7 +1546,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int
w, int h)
vnc_tight_stop(vs);
#ifdef CONFIG_VNC_JPEG
- if (vs->tight.quality != (uint8_t)-1) {
+ if (!vs->vd->non_adaptive && vs->tight.quality != (uint8_t)-1) {
double freq = vnc_update_freq(vs, x, y, w, h);
if (freq < tight_jpeg_conf[vs->tight.quality].jpeg_freq_min) {
diff --git a/ui/vnc.c b/ui/vnc.c
index dffb4aa..cb37a75 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2380,10 +2380,12 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
VncState *vs;
int has_dirty = 0;
- struct timeval tv;
+ struct timeval tv = { 0, 0 };
- gettimeofday(&tv, NULL);
- has_dirty = vnc_update_stats(vd, &tv);
+ if (!vd->non_adaptive) {
+ gettimeofday(&tv, NULL);
+ has_dirty = vnc_update_stats(vd, &tv);
+ }
/*
* Walk through the guest dirty map.
@@ -2412,7 +2414,8 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
if (memcmp(server_ptr, guest_ptr, cmp_bytes) == 0)
continue;
memcpy(server_ptr, guest_ptr, cmp_bytes);
- vnc_rect_updated(vd, x, y, &tv);
+ if (!vd->non_adaptive)
+ vnc_rect_updated(vd, x, y, &tv);
QTAILQ_FOREACH(vs, &vd->clients, next) {
set_bit((x / 16), vs->dirty[y]);
}
@@ -2717,6 +2720,8 @@ int vnc_display_open(DisplayState *ds, const char
*display)
acl = 1;
} else if (strncmp(options, "lossy", 5) == 0) {
vs->lossy = true;
+ } else if (strncmp(options, "non-adapative", 13) == 0) {
+ vs->non_adaptive = true;
}
}
diff --git a/ui/vnc.h b/ui/vnc.h
index 979467b..f502690 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -143,6 +143,7 @@ struct VncDisplay
char *password;
int auth;
bool lossy;
+ bool non_adaptive;
#ifdef CONFIG_VNC_TLS
int subauth; /* Used by VeNCrypt */
VncDisplayTLS tls;
--
1.7.1
- [Qemu-devel] [PATCH 09/15] vnc: fix uint8_t comparisons with negative values, (continued)
- [Qemu-devel] [PATCH 09/15] vnc: fix uint8_t comparisons with negative values, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 08/15] vnc: Add ZRLE and ZYWRLE encodings., Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 10/15] vnc: fix lossy rect refreshing, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 11/15] bitmap: add a generic bitmap and bitops library, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 12/15] vnc: use the new generic bitmap functions, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 13/15] vnc: don't try to send bigger updates that client height, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 14/15] vnc: tight: tweak adaptive tight settings, Corentin Chary, 2010/08/11
- [Qemu-devel] [PATCH 15/15] vnc: add a non-adaptive option,
Corentin Chary <=