diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /video/out/vo.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 64bf7ab051..f0c865d269 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -808,7 +808,7 @@ static bool render_frame(struct vo *vo) pthread_mutex_unlock(&in->lock); wakeup_core(vo); // core can queue new video now - MP_STATS(vo, "start video"); + MP_STATS(vo, "start video-draw"); if (vo->driver->draw_frame) { vo->driver->draw_frame(vo, frame); @@ -816,12 +816,15 @@ static bool render_frame(struct vo *vo) vo->driver->draw_image(vo, mp_image_new_ref(frame->current)); } + MP_STATS(vo, "end video-draw"); + wait_until(vo, target); + MP_STATS(vo, "start video-flip"); + vo->driver->flip_page(vo); - MP_STATS(vo, "end video"); - MP_STATS(vo, "video_end"); + MP_STATS(vo, "end video-flip"); pthread_mutex_lock(&in->lock); in->dropped_frame = prev_drop_count < vo->in->drop_count; |