maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-1389: Include frame rendering time in lag calculations. Sleep only if necessary.

Browse Source
This commit is contained in:
Michael Jumper 2016-03-08 14:47:33 -08:00
parent 3c572501a9
commit 6f264f9c31
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/protocols/vnc/vnc.c
View File

@ -347,14 +347,6 @@ void* guac_vnc_client_thread(void* data) {
guac_timestamp frame_start = guac_timestamp_current(); guac_timestamp frame_start = guac_timestamp_current();
/* Calculate time since last frame */
int time_elapsed = frame_start - last_frame_end;
int processing_lag = guac_client_get_processing_lag(client);
/* Force roughly-equal length of server and client frames */
if (time_elapsed < processing_lag)
guac_timestamp_msleep(processing_lag - time_elapsed);
/* Read server messages until frame is built */ /* Read server messages until frame is built */
do { do {
@ -383,19 +375,29 @@ void* guac_vnc_client_thread(void* data) {
} while (wait_result > 0); } while (wait_result > 0);
/* Record end of frame */
last_frame_end = guac_timestamp_current();
} }
/* If an error occurs, log it and fail */ /* If an error occurs, log it and fail */
if (wait_result < 0) if (wait_result < 0)
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Connection closed."); guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Connection closed.");
/* Flush frame */
guac_common_surface_flush(vnc_client->display->default_surface); guac_common_surface_flush(vnc_client->display->default_surface);
guac_client_end_frame(client); guac_client_end_frame(client);
guac_socket_flush(client->socket); guac_socket_flush(client->socket);
/* Calculate time since previous frame ended */
int current_frame_end = guac_timestamp_current();
int time_elapsed = current_frame_end - last_frame_end;
int processing_lag = guac_client_get_processing_lag(client);
/* Insert delays as necessary to allow client to catch up */
if (time_elapsed < processing_lag)
guac_timestamp_msleep(processing_lag - time_elapsed);
/* Record end of frame */
last_frame_end = current_frame_end;
} }
guac_client_log(client, GUAC_LOG_INFO, "Internal VNC client disconnected"); guac_client_log(client, GUAC_LOG_INFO, "Internal VNC client disconnected");