sub/sd_ass: add separate option for ass sub color override

Previusly this flag was turned on with sub-ass-override >= force.
This commit makes it an independent option.

Author: X2E4VXpZKv

DOCS/interface-changes/sub-ass-override-colors.txt

@@ -0,0 +1 @@
+add `--sub-ass-override-colors` option

DOCS/man/options.rst

@@ -2668,6 +2668,12 @@ Subtitles
 
     Default: strip.
 
+``--sub-ass-override-colors``
+    Enables overriding ass subtitle dialogue colors with the user default ones
+    (defined with ``--sub-color`` / ``--sub-outline-color``).
+
+    Default: no.
+
 ``--sub-ass-force-margins``
     Enables placing toptitles and subtitles in black borders when they are
     available, if the subtitles are in the ASS format.

options/options.c

@@ -329,6 +329,7 @@ const struct m_sub_options mp_subtitle_sub_opts = {
         {"sub-ass-shaper", OPT_REPLACED("sub-shaper")},
         {"sub-ass-prune-delay", OPT_DOUBLE(ass_prune_delay), M_RANGE(-1.0, 10000.0)},
         {"sub-ass-justify", OPT_BOOL(ass_justify)},
+        {"sub-ass-override-colors", OPT_BOOL(ass_override_colors)},
         {"sub-scale-by-window", OPT_BOOL(sub_scale_by_window)},
         {"sub-scale-with-window", OPT_BOOL(sub_scale_with_window)},
         {"sub-ass-scale-with-window", OPT_BOOL(ass_scale_with_window)},

options/options.h

@@ -124,6 +124,7 @@ struct mp_subtitle_opts {
     int sub_shaper;
     double ass_prune_delay;
     bool ass_justify;
+    bool ass_override_colors;
     bool sub_clear_on_seek;
     int teletext_page;
     bool sub_past_video_end;

sub/sd_ass.c

@@ -567,7 +567,6 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
     if (total_override) {
         set_force_flags |= ASS_OVERRIDE_BIT_FONT_NAME
                             | ASS_OVERRIDE_BIT_FONT_SIZE_FIELDS
-                            | ASS_OVERRIDE_BIT_COLORS
                             | ASS_OVERRIDE_BIT_BORDER;
         if (!opts->sub_scale_signs)
             set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
@@ -584,6 +583,9 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
     if ((converted || shared_opts->ass_style_override[sd->order]) && opts->ass_justify)
         set_force_flags |= ASS_OVERRIDE_BIT_JUSTIFY;
 #endif
+    if (opts->ass_override_colors)
+        set_force_flags |= ASS_OVERRIDE_BIT_COLORS;
+
     ass_set_selective_style_override_enabled(priv, set_force_flags);
     ASS_Style style = {0};
     mp_ass_set_style(&style, MP_ASS_FONT_PLAYRESY, opts->sub_style);