summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-27 22:04:44 +0100
committerwm4 <wm4@nowhere>2015-11-27 22:04:44 +0100
commit7023c383b22a9619840b88175a8c272f2f9d4414 (patch)
tree5bb7828079a20407971c72380f74a3f4164adb5b /video/out/vo.c
parent2bee47fd27f4ee544f1db15fcedf8cd94df89610 (diff)
downloadmpv-7023c383b22a9619840b88175a8c272f2f9d4414.tar.bz2
mpv-7023c383b22a9619840b88175a8c272f2f9d4414.tar.xz
vo: change vo_frame field units
This was just converting back and forth between int64_t/microseconds and double/seconds. Remove this stupidity. The pts/duration fields are still in microseconds, but they have no meaning in the display-sync case (also drop printing the pts field from opengl/video.c - it's always 0).
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 7d39c7e613..a3254d8866 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -741,8 +741,6 @@ static bool render_frame(struct vo *vo)
int64_t duration = frame->duration;
int64_t end_time = pts + duration;
- frame->vsync_interval = in->vsync_interval;
-
// Time at which we should flip_page on the VO.
int64_t target = frame->display_synced ? 0 : pts - in->flip_queue_offset;
@@ -761,7 +759,7 @@ static bool render_frame(struct vo *vo)
// frame currently drawn, while in->current_frame is the potentially next.)
in->current_frame->repeat = true;
if (frame->display_synced) {
- in->current_frame->vsync_offset += in->vsync_interval;
+ in->current_frame->vsync_offset += in->current_frame->vsync_interval;
in->dropped_frame |= in->current_frame->num_vsyncs < 1;
}
if (in->current_frame->num_vsyncs > 0)