diff options
| author | wm4 <wm4@nowhere> | 2014-12-10 17:00:18 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-10 17:00:18 +0100 |
| commit | 56eb2b71b8787364238cf80bfb953aba14d55dbf (patch) | |
| tree | aca17d71fb698c3c665d4c99c8be60bc594f64a6 /video/out/vo.c | |
| parent | c6dc0c6d99593a809803b1bf4bcc183b084f9b79 (diff) | |
| download | mpv-56eb2b71b8787364238cf80bfb953aba14d55dbf.tar.bz2 mpv-56eb2b71b8787364238cf80bfb953aba14d55dbf.tar.xz | |
vo: fix some nonsense
Commit d38bc531 is incorrect: the 50ms queue-ahead value and the flip
queue offset have different functions. The latter is about calling
flip_page in advance, so the change attempted to show video frames 50ms
in advance on all VOs.
The change was for vo_opengl_cb, but that can be handled differently.
Diffstat (limited to 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 710f2f28ce..f6dda92532 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -230,7 +230,6 @@ static struct vo *vo_create(struct mpv_global *global, talloc_steal(vo, log); *vo->in = (struct vo_internal) { .dispatch = mp_dispatch_create(vo), - .flip_queue_offset = VO_DEFAULT_FLIP_QUEUE_OFFSET, }; mp_make_wakeup_pipe(vo->in->wakeup_pipe); mp_dispatch_set_wakeup_fn(vo->in->dispatch, dispatch_wakeup_cb, vo); @@ -484,8 +483,8 @@ bool vo_is_ready_for_frame(struct vo *vo, int64_t next_pts) if (r) { // Don't show the frame too early - it would basically freeze the // display by disallowing OSD redrawing or VO interaction. - // Actually render the frame at earliest 50ms before target time - // (flip_queue_offset is usually VO_DEFAULT_FLIP_QUEUE_OFFSET, 50ms). + // Actually render the frame at earliest 50ms before target time. + next_pts -= (uint64_t)(0.050 * 1e6); next_pts -= in->flip_queue_offset; int64_t now = mp_time_us(); if (next_pts > now) |