From 2363e15eeef4064f95eeec1b487c438b62dc7a02 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 26 May 2019 01:56:48 +0200 Subject: player: simplify/fix --start/--end handling with --rebase-start-time=no The get_play_start_pts() function was supposed to return "rebased" (relative to 0) timestamps. This was roundabout, because one of 2 callers just added the offset back, and the other caller actually expected an absolute timestamp. Change rel_time_to_abs() (whose return value get_play_start_pts() returns without further changes) to return absolute times. This should fix that absolute and relative times passed to --start and --end were treated the same, which can't be right. It probably also fixes --end if --rebase-start-time=no is used (which can't have been correct either). All in all I'm not sure why --rebase-start-time=no or absolute vs. relative times in --start/--end even exist, when they were incorrectly implemented for years. Untested, because no sample file and I don't care. However, if anyone cares, and I got it wrong, I hope it's simple to fix. --- player/loadfile.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'player/loadfile.c') diff --git a/player/loadfile.c b/player/loadfile.c index c16b8e8152..078eac53a6 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1557,13 +1557,6 @@ static void play_current_file(struct MPContext *mpctx) play_start_pts = MPMAX(mpctx->demuxer->duration, 0); if (play_start_pts != MP_NOPTS_VALUE) { - /* - * get_play_start_pts returns rebased values, but - * we want an un rebased value to feed to seeker. - */ - if (!opts->rebase_start_time){ - play_start_pts += mpctx->demuxer->start_time; - } queue_seek(mpctx, MPSEEK_ABSOLUTE, play_start_pts, MPSEEK_DEFAULT, 0); execute_queued_seek(mpctx); } -- cgit v1.2.3