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.

1 files changed, 2 insertions, 21 deletions

diff --git a/core/command.c b/core/command.c
index 7eb36be5f3..4e82ceccd8 100644
--- a/core/command.c
+++ b/core/command.c
@@ -50,7 +50,6 @@
 #include "audio/filter/af.h"
 #include "video/decode/dec_video.h"
 #include "audio/decode/dec_audio.h"
-#include "sub/spudec.h"
 #include "core/path.h"
 #include "sub/ass_mp.h"
 #include "stream/tv.h"
@@ -1307,8 +1306,7 @@ static int mp_property_sub_visibility(m_option_t *prop, int action,
     switch (action) {
     case M_PROPERTY_SET:
         opts->sub_visibility = *(int *)arg;
-        if (vo_spudec)
-            vo_osd_changed(OSDTYPE_SPU);
+        osd_changed_all(mpctx->osd);
         return M_PROPERTY_OK;
     case M_PROPERTY_GET:
         *(int *)arg = opts->sub_visibility;
@@ -1317,23 +1315,6 @@ static int mp_property_sub_visibility(m_option_t *prop, int action,
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
-/// Show only forced subtitles (RW)
-static int mp_property_sub_forced_only(m_option_t *prop, int action,
-                                       void *arg, MPContext *mpctx)
-{
-    struct MPOpts *opts = &mpctx->opts;
-
-    if (!vo_spudec)
-        return M_PROPERTY_UNAVAILABLE;
-
-    if (action == M_PROPERTY_SET) {
-        opts->forced_subs_only = *(int *)arg;
-        spudec_set_forced_subs_only(vo_spudec, opts->forced_subs_only);
-        return M_PROPERTY_OK;
-    }
-    return mp_property_generic_option(prop, action, arg, mpctx);
-}
-
 
 #ifdef CONFIG_TV
 
@@ -1514,7 +1495,7 @@ static const m_option_t mp_properties[] = {
     M_OPTION_PROPERTY_CUSTOM("sub-pos", mp_property_sub_pos),
     { "sub-visibility", mp_property_sub_visibility, CONF_TYPE_FLAG,
       M_OPT_RANGE, 0, 1, NULL },
-    M_OPTION_PROPERTY_CUSTOM("sub-forced-only", mp_property_sub_forced_only),
+    M_OPTION_PROPERTY_CUSTOM("sub-forced-only", property_osd_helper),
     M_OPTION_PROPERTY_CUSTOM("sub-scale", property_osd_helper),
 #ifdef CONFIG_ASS
     M_OPTION_PROPERTY_CUSTOM("ass-use-margins", property_osd_helper),