path: root/sub/sd_ass.c
diff options
authorwm4 <wm4@nowhere>2013-04-29 01:13:22 +0200
committerwm4 <wm4@nowhere>2013-05-30 22:40:32 +0200
commit26842806431a1d21e3c3c430994cd6901e36a08e (patch)
treeef0c302e3a60cd7c20e98787de1ccef9ed7ee32b /sub/sd_ass.c
parent724f576211c1ea07e0423ac8a9c0e4f273c452fb (diff)
sub: add sd_spu.c to wrap spudec, cleanup mplayer.c
This unifies the subtitle rendering path. Now all subtitle rendering goes through sd_ass.c/sd_lavc.c/sd_spu.c. Before that commit, the spudec.h functions were used directly in mplayer.c, which introduced many special cases. Add sd_spu.c, which is just a small wrapper connecting the new subtitle render API with the dusty old vobsub decoder in spudec.c. One detail that changes is that we always pass the palette as extra data, instead of passing the libdvdread palette as pointer to spudec directly. This is a bit roundabout, but actually makes the code simpler and more elegant: the difference between DVD and non-DVD dvdsubs is reduced. Ideally, we would just delete spudec.c and use libavcodec's DVD sub decoder. However, DVD playback with demux_mpg produces packets incompatible to lavc. There are incompatibilities the other way around as well: packets from libavformat's vobsub demuxer are incompatible to spudec.c. So we define a new subtitle codec name for demux_mpg subs, "dvd_subtitle_mpg", which only sd_spu can decode. There is actually code in spudec.c to "assemble" fragments into complete packets, but using the whole spudec.c is easier than trying to move this code into demux_mpg to fix subtitle packets. As additional complication, Libav 9.x can't decode DVD subs correctly, so use sd_spu in that case as well.
Diffstat (limited to 'sub/sd_ass.c')
1 files changed, 0 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 1501f5da54..3dfbbd05fb 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -295,7 +295,6 @@ struct sh_sub *sd_ass_create_from_track(struct ass_track *track,
.gsh = talloc_struct(sh, struct sh_stream, {
.codec = codec,
- .sd_driver = &sd_ass,
.context = talloc_struct(sh, struct sd_ass_priv, {
.ass_track = track,
.vsfilter_aspect = is_ass_sub(codec),