mirror of
https://github.com/mpv-player/mpv
synced 2024-12-16 03:45:23 +00:00
5a89150a46
This was used with --no-sub-ass (aka --no-ass). This option (which is not yet removed) strips all styling from the subtitles, and renders them as plaintext only. For some reason, it originally seemed convenient to reuse all the OSD text rendering code (osd_libass.c). While this was indeed simple, it had a bad influence on the rest of the code. For example, it had to decide whether to go through the OSD code path, or the proper subtitle renderer in sd_ass.c. Kill the OSD subtitle renderer. Reimplement --no-sub-ass and also "secondary" subtitles in sd_ass.c. fill_plaintext() contains some rather minor code duplication with osd_libass.c for setting up a dummy ASS_Event and escaping the stripped text. Since sd_ass.c already has to handle "normal" text subtitles, and has code for stripping ASS tags, this remains all relatively simple. Remove all the unnecessary crap from the rest of the code. |
||
|---|---|---|
| .. | ||
| ass_mp.c | ||
| ass_mp.h | ||
| dec_sub.c | ||
| dec_sub.h | ||
| draw_bmp.c | ||
| draw_bmp.h | ||
| img_convert.c | ||
| img_convert.h | ||
| osd_dummy.c | ||
| osd_font.otf | ||
| osd_libass.c | ||
| osd_state.h | ||
| osd.c | ||
| osd.h | ||
| sd_ass.c | ||
| sd_lavc_conv.c | ||
| sd_lavc.c | ||
| sd_lavf_srt.c | ||
| sd_microdvd.c | ||
| sd_movtext.c | ||
| sd_srt.c | ||
| sd.h | ||