From f4ce99d08283a31a410623294e7a6ef31e361543 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jun 2015 20:04:49 +0200 Subject: Revert "vo: improve frame drop logic on high playback rate" This reverts commit ffcad1a72b9a3bf5a7ac5ddcbfa71ec19b6faf9b. --- video/out/vo.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'video') diff --git a/video/out/vo.c b/video/out/vo.c index 696f755cf8..dedb032e91 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -626,22 +626,14 @@ static bool render_frame(struct vo *vo) if (!in->hasframe_rendered) duration = -1; // disable framedrop - // If the clip and display have similar/identical fps, it's possible that + // if the clip and display have similar/identical fps, it's possible that // we'll be very slightly late frequently due to timing jitter, or if the // clip/container timestamps are not very accurate. - // So if we dropped the previous frame, keep dropping until we're aligned + // so if we dropped the previous frame, keep dropping until we're aligned // perfectly, else, allow some slack (1 vsync) to let it settle into a rhythm. - // On low clip fps, we don't drop anyway and the slack logic doesn't matter. - // If the clip fps is more than ~5% above screen fps, we remove this slack - // and use "normal" logic to allow more regular drops of 1 frame at a time. - bool use_slack = duration > (0.95 * in->vsync_interval); in->dropped_frame = duration >= 0 && - use_slack ? ((in->dropped_frame && end_time < next_vsync) || - (end_time < prev_vsync)) // hard threshold - 1 vsync late - : - end_time < next_vsync; // normal frequent drops - + (end_time < prev_vsync)); // hard threshold - 1 vsync late in->dropped_frame &= !(vo->driver->caps & VO_CAP_FRAMEDROP); in->dropped_frame &= (vo->global->opts->frame_dropping & 1); -- cgit v1.2.3