From f3362e22ebd8a39419c8225c3254fbbebe57d6e9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 7 May 2014 21:50:16 +0200 Subject: player: remove VO from seeking code path Until recently, the VO was an unavoidable part of the seeking code path. This was because vdpau deinterlacing could double the framerate, and hr- seek and framestepping etc. all had to "see" the additional frames. But we've removed the frame doubling from the vdpau VO and moved it into a video filter (vf_vdpaupp), and there's no reason left why the VO should participate in seeking. Instead of queuing frames to the VO during seek and skipping them afterwards, drop the frames early. This actually might make seeking with vo_vdpau and software decoding faster, although I haven't measured it. --- video/out/vo.c | 5 ----- video/out/vo.h | 1 - 2 files changed, 6 deletions(-) (limited to 'video') diff --git a/video/out/vo.c b/video/out/vo.c index 61143ea340..8cf867ef3b 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -354,11 +354,6 @@ static void shift_queue(struct vo *vo) vo->video_queue[n] = vo->video_queue[n + 1]; } -void vo_skip_frame(struct vo *vo) -{ - shift_queue(vo); -} - void vo_new_frame_imminent(struct vo *vo) { assert(vo->num_video_queue > 0); diff --git a/video/out/vo.h b/video/out/vo.h index fe7fd151e8..1a7fdb4901 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -279,7 +279,6 @@ bool vo_get_want_redraw(struct vo *vo); bool vo_has_next_frame(struct vo *vo, bool eof); double vo_get_next_pts(struct vo *vo, int index); bool vo_needs_new_image(struct vo *vo); -void vo_skip_frame(struct vo *vo); void vo_new_frame_imminent(struct vo *vo); void vo_draw_osd(struct vo *vo, struct osd_state *osd); void vo_flip_page(struct vo *vo, int64_t pts_us, int duration); -- cgit v1.2.3