player: eliminate demux_get_next_pts()

This slightly changes behavior when seeking with external audio/subtitle
tracks if transport streams and mpeg files are played, as well as
behavior when seeking with such external tracks.

get_main_demux_pts() is evil because it always blocks on the demuxer (if
there isn't already a packet queued). Thus it could lock up the player,
which is a shame because all other possible causes have been removed.

The reduced "precision" when seeking in the ts/mpeg cases (where
SEEK_FACTOR is used, resulting in byte seeks instead of timestamp seeks)
might lead to issues. We should probably drop this heuristic. (It was
introduced because there is no other way to seek in files with PTS
resets with libavformat, but its value is still questionable.)

1 files changed, 0 insertions, 14 deletions

diff --git a/player/misc.c b/player/misc.c
index fc98136e5c..d60f25f05b 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -101,20 +101,6 @@ double get_play_end_pts(struct MPContext *mpctx)
     return end;
 }
 
-// Time used to seek external tracks to.
-double get_main_demux_pts(struct MPContext *mpctx)
-{
-    double main_new_pos = MP_NOPTS_VALUE;
-    if (mpctx->demuxer) {
-        for (int n = 0; n < demux_get_num_stream(mpctx->demuxer); n++) {
-            struct sh_stream *stream = demux_get_stream(mpctx->demuxer, n);
-            if (main_new_pos == MP_NOPTS_VALUE && stream->type != STREAM_SUB)
-                main_new_pos = demux_get_next_pts(stream);
-        }
-    }
-    return main_new_pos;
-}
-
 float mp_get_cache_percent(struct MPContext *mpctx)
 {
     if (mpctx->demuxer) {