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

GUACAMOLE-110: Merge fix for timestamp rounding bug in guacenc.

Browse Source
This commit is contained in:
Michael Jumper 2016-10-03 11:38:41 -07:00
commit 3c459100d7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/guacenc/video.c
View File

@ -209,6 +209,8 @@ static int guacenc_video_flush_frame(guacenc_video* video) {
int guacenc_video_advance_timeline(guacenc_video* video, int guacenc_video_advance_timeline(guacenc_video* video,
guac_timestamp timestamp) { guac_timestamp timestamp) {
guac_timestamp next_timestamp = timestamp;
/* Flush frames as necessary if previously updated */ /* Flush frames as necessary if previously updated */
if (video->last_timestamp != 0) { if (video->last_timestamp != 0) {
@ -220,6 +222,10 @@ int guacenc_video_advance_timeline(guacenc_video* video,
if (elapsed == 0) if (elapsed == 0)
return 0; return 0;
/* Use frame time as last_timestamp */
next_timestamp = video->last_timestamp
+ elapsed * 1000 / GUACENC_VIDEO_FRAMERATE;
/* Flush frames to bring timeline in sync, duplicating if necessary */ /* Flush frames to bring timeline in sync, duplicating if necessary */
do { do {
guacenc_video_flush_frame(video); guacenc_video_flush_frame(video);
@ -228,7 +234,7 @@ int guacenc_video_advance_timeline(guacenc_video* video,
} }
/* Update timestamp */ /* Update timestamp */
video->last_timestamp = timestamp; video->last_timestamp = next_timestamp;
return 0; return 0;
} }