diff options
| -rw-r--r-- | ui/vnc.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 243c72be13..4ba7fc076a 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -961,6 +961,25 @@ static int find_and_clear_dirty_height(VncState *vs, return h; } +static bool vnc_should_update(VncState *vs) +{ + switch (vs->update) { + case VNC_STATE_UPDATE_NONE: + break; + case VNC_STATE_UPDATE_INCREMENTAL: + /* Only allow incremental updates if the output buffer + * is empty, or if audio capture is enabled. + */ + if (!vs->output.offset || vs->audio_cap) { + return true; + } + break; + case VNC_STATE_UPDATE_FORCE: + return true; + } + return false; +} + static int vnc_update_client(VncState *vs, int has_dirty) { VncDisplay *vd = vs->vd; @@ -975,13 +994,7 @@ static int vnc_update_client(VncState *vs, int has_dirty) } vs->has_dirty += has_dirty; - if (vs->update == VNC_STATE_UPDATE_NONE) { - return 0; - } - - if (vs->output.offset && !vs->audio_cap && - vs->update != VNC_STATE_UPDATE_FORCE) { - /* kernel send buffers are full -> drop frames to throttle */ + if (!vnc_should_update(vs)) { return 0; } |