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

GUACAMOLE-172: Use frame start as end of previous frame (ignore server-side time).

Browse Source
This commit is contained in:
Michael Jumper 2016-10-14 13:31:41 -07:00
parent f641d91b55
commit 234f98705e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/protocols/rdp/rdp.c
View File

@ -832,6 +832,13 @@ static int guac_rdp_handle_connection(guac_client* client) {
break; break;
} while (wait_result > 0); } while (wait_result > 0);
/* Record end of frame, excluding server-side rendering time (we
* assume server-side rendering time will be consistent between any
* two subsequent frames, and that this time should thus be
* excluded from the required wait period of the next frame). */
last_frame_end = frame_start;
} }
/* If an error occurred, fail */ /* If an error occurred, fail */
@ -839,14 +846,7 @@ static int guac_rdp_handle_connection(guac_client* client) {
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR,
"Connection closed."); "Connection closed.");
/* Record end of frame, excluding server-side rendering time (we assume
* server-side rendering time will be consistent between any two
* subsequent frames, and that this time should thus be excluded from
* the required wait period of the next frame). */
last_frame_end = guac_timestamp_current();
/* Flush frame */ /* Flush frame */
/* End of frame */
guac_common_display_flush(rdp_client->display); guac_common_display_flush(rdp_client->display);
guac_client_end_frame(client); guac_client_end_frame(client);
guac_socket_flush(client->socket); guac_socket_flush(client->socket);

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

@ -402,18 +402,18 @@ void* guac_vnc_client_thread(void* data) {
} while (wait_result > 0); } while (wait_result > 0);
/* Record end of frame, excluding server-side rendering time (we
* assume server-side rendering time will be consistent between any
* two subsequent frames, and that this time should thus be
* excluded from the required wait period of the next frame). */
last_frame_end = frame_start;
} }
/* 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.");
/* Record end of frame, excluding server-side rendering time (we assume
* server-side rendering time will be consistent between any two
* subsequent frames, and that this time should thus be excluded from
* the required wait period of the next frame). */
last_frame_end = guac_timestamp_current();
/* Flush frame */ /* 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);