subs: always use sub decoder framework for libass rendering
commit5639702953bb7d4321db822fc55e4272148ededa
authorUoti Urpala <uau@mplayer2.org>
Sat, 25 Aug 2012 18:22:39 +0000 (25 21:22 +0300)
committerUoti Urpala <uau@mplayer2.org>
Fri, 31 Aug 2012 17:30:42 +0000 (31 20:30 +0300)
tree1871688b9dd18bfe044c853a1982f2f4a8e92b49
parentfb3e6f56b356131accee98e3d32ddceddf96b6fb
subs: always use sub decoder framework for libass rendering

Remove subtitle selection code setting osd->ass_track directly and
vf_ass/vf_vo code rendering the track directly with libass. Instead,
do track selection and rendering with dec_sub.c functions.

Before, mpctx->set_of_ass_tracks[] contained bare libass tracks
generated from external subtitle files. For use with dec_sub.c, it now
contains struct sh_sub instances with decoder already initialized.

This commit breaks the sub_step command ('g' and 'y' keys) for
libass-rendered subtitles. It could be fixed, but it's so useless -
especially as with the existing implementation there's no practical
way to get subtitle delay back to normal after using it - that I
didn't bother.
15 files changed:
command.c
defaultopts.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
mp_core.h
mplayer.c
options.h
sub/ass_mp.h
sub/dec_sub.c
sub/dec_sub.h
sub/osd_libass.c
sub/sd.h
sub/sd_ass.c
sub/sub.c
sub/sub.h