sub: add sub-scale-signs

Allows --sub-scale to alow scale typesetting

llyyr committed 1 year ago

Commit baecbb11 parent 996e58a5 files · +14 −3Browse files

Unified · Split

5 files

@@ -0,0 +1 @@
		1	add `--sub-scale-signs` to allow `--sub-scale` to also scale events detected to be signs by libass

         This affects ASS subtitles as well, and may lead to incorrect subtitle
         rendering. Use with care, or use ``--sub-font-size`` instead.
+``--sub-scale-signs=<yes|no>``
+    When set to yes, also apply ``--sub-scale`` to typesetting (or "signs").
+    When this is set to no, ``--sub-scale`` is only applied to dialogue. The
+    distinction between dialogue and typesetting is done on a best effort basis
+    and is not infallible (default: no).
 ``--sub-scale-by-window=<yes|no>``
     Whether to scale subtitles with the window size (default: yes). If this is
     disabled while ``--sub-scale-with-window`` is set to yes, changing the window

@@ -298,6 +298,7 @@ const struct m_sub_options mp_subtitle_sub_opts = { · 297 unmodified lines
298	{"sub-gray", OPT_BOOL(sub_gray)},	298	{"sub-gray", OPT_BOOL(sub_gray)},
299	{"sub-ass", OPT_BOOL(ass_enabled), .flags = UPDATE_SUB_HARD},	299	{"sub-ass", OPT_BOOL(ass_enabled), .flags = UPDATE_SUB_HARD},
300	{"sub-scale", OPT_FLOAT(sub_scale), M_RANGE(0, 100)},	300	{"sub-scale", OPT_FLOAT(sub_scale), M_RANGE(0, 100)},
		301	{"sub-scale-signs", OPT_BOOL(sub_scale_signs)},
301	{"sub-line-spacing", OPT_FLOAT(sub_line_spacing), M_RANGE(-1000, 1000)},	302	{"sub-line-spacing", OPT_FLOAT(sub_line_spacing), M_RANGE(-1000, 1000)},
302	{"sub-ass-line-spacing", OPT_REPLACED("sub-line-spacing")},	303	{"sub-ass-line-spacing", OPT_REPLACED("sub-line-spacing")},
303	{"sub-use-margins", OPT_BOOL(sub_use_margins)},	304	{"sub-use-margins", OPT_BOOL(sub_use_margins)},

@@ -104,6 +104,7 @@ struct mp_subtitle_opts { · 103 unmodified lines
104	bool ass_scale_with_window;	104	bool ass_scale_with_window;
105	struct osd_style_opts *sub_style;	105	struct osd_style_opts *sub_style;
106	float sub_scale;	106	float sub_scale;
		107	bool sub_scale_signs;
107	float sub_gauss;	108	float sub_gauss;
108	bool sub_gray;	109	bool sub_gray;
109	bool ass_enabled;	110	bool ass_enabled;

         set_force_flags |= ASS_OVERRIDE_BIT_FONT_NAME
                             | ASS_OVERRIDE_BIT_FONT_SIZE_FIELDS
                             | ASS_OVERRIDE_BIT_COLORS
-                            | ASS_OVERRIDE_BIT_BORDER
+                            | ASS_OVERRIDE_BIT_BORDER;
-                            | ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
+        if (!opts->sub_scale_signs)
+            set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
 #if LIBASS_VERSION >= 0x01703020
         set_force_flags |= ASS_OVERRIDE_BIT_BLUR;
 #endif
     }
-    if (shared_opts->ass_style_override[sd->order] == ASS_STYLE_OVERRIDE_SCALE)
+    if (shared_opts->ass_style_override[sd->order] == ASS_STYLE_OVERRIDE_SCALE &&
+        !opts->sub_scale_signs)
         set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
     if (converted)
         set_force_flags |= ASS_OVERRIDE_BIT_ALIGNMENT;

Keyboard shortcuts