diff options
author | wm4 <wm4@nowhere> | 2015-12-18 00:51:57 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-12-18 03:52:57 +0100 |
commit | 2c7db48195b03e93ee3cbf382ccabcedb96a6830 (patch) | |
tree | 165c6d52549991bf6c03cd47e495a558f14ac4ce /sub/sd_lavc_conv.c | |
parent | 7137afeb2c466135ab0e01ee0f9cbd2abd000563 (diff) | |
download | mpv-2c7db48195b03e93ee3cbf382ccabcedb96a6830.tar.bz2 mpv-2c7db48195b03e93ee3cbf382ccabcedb96a6830.tar.xz |
sub: do not clear subtitle list on seeking
This affects non-ASS text subtitles (those which go through libavcodec's
subtitle converter), which are muxed with video/audio. (Typically srt
subs in mkv.)
The problem is that seeking in the file can send a subtitle packet to
the decoder multiple times. These packets are interlaved with video,
and thus can't be all read when opening the file. Rather, subtitle
packets can essentially be randomly skipped or repeated (by seeking).
Until recently, this was solved by scanning the libass event list for
duplicates. Then our builtin srt-to-ass converter was removed, and
the problem was handled by fully clearing the subtitle list on each
seek.
This resulted in sub-seek not working properly for this type of file.
Since the subtitle list was cleared on seek, it was not possible to
do e.g. sub-seeks to subtitles before the current playback position.
Fix this by not clearing the list, and intead explicitly rejecting
duplicate packets. We use the packet file position was unique ID for
subtitles; this is confirmed working for most file formats (although
it is slightly risky - new demuxers may not necessarily set the file
position to something unique, or at all).
The list of seen packets is sorted, and the lookup uses binary search.
This is to avoid quadratic complexity when subtitles are added in
bulks, such as when opening a text subtitle file.
In some places, the code has to be adjusted to pass through the packet
file position correctly.
Diffstat (limited to 'sub/sd_lavc_conv.c')
-rw-r--r-- | sub/sd_lavc_conv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c index 8074cd865e..ffea1860cd 100644 --- a/sub/sd_lavc_conv.c +++ b/sub/sd_lavc_conv.c @@ -250,7 +250,7 @@ static void decode(struct sd *sd, struct demux_packet *packet) // ASS packet format, in which case pts/duration might be ignored // at a later point. sd_conv_add_packet(sd, ass_line, strlen(ass_line), - packet->pts, packet->duration); + packet->pts, packet->duration, packet->pos + i); } } |