mirror of https://github.com/mpv-player/mpv
06e3dc8eba
Timeline handling converted the pts values from demuxed subtitles to timeline scale. Change the code to do most subtitle handling in original subtitle source pts, and instead convert current playback timeline pts to those units when deciding which subtitle to show. The main functionality changes are that now demuxed subtitles which overlap chapter boundaries are handled correctly (at least for libass subtitles), and external subtitles are assumed to use same pts scale as current source (this needs improvements later). Before, a video subtitle that had a duration continuing past the end of the chapter would continue to be shown for the original duration, even if the chapter ended and playback switched to a position in the source where the subtitle shouldn't exist. Now, the subtitle will correctly end. Before, external subtitle files were interpreted as specifying pts values in timeline scale. Now, they're interpreted as specifying pts values in source file time scale, for _every_ source file. This is probably more likely to be what the user wants for the "main" source file in case there is one, but almost certainly not quite right for multiple source files where the same subs could be shown over different scenes. If the user wants them to match some main source file, it's probably still better to have incorrect extra subs for video from some files than to have every subtitle appearing at the wrong time. The new code makes it easier to change the interpretation of the subtitle times, and some configurability should be added in the future. |
||
|---|---|---|
| .. | ||
| ass_mp.c | ||
| ass_mp.h | ||
| av_sub.c | ||
| av_sub.h | ||
| dec_sub.c | ||
| dec_sub.h | ||
| find_sub.c | ||
| find_subfiles.c | ||
| find_subfiles.h | ||
| font_load.c | ||
| font_load.h | ||
| font_load_ft.c | ||
| osd_font.h | ||
| sd.h | ||
| sd_ass.c | ||
| spudec.c | ||
| spudec.h | ||
| sub.c | ||
| sub.h | ||
| sub_cc.c | ||
| sub_cc.h | ||
| subassconvert.c | ||
| subassconvert.h | ||
| subreader.c | ||
| subreader.h | ||
| unrar_exec.c | ||
| unrar_exec.h | ||
| vobsub.c | ||
| vobsub.h | ||