From 4d11f32162b08e3b48ae382e2ed0a151035f8aea Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 19 Oct 2012 19:25:18 +0200 Subject: VO, sub: refactor Remove VFCTRL_DRAW_OSD, VFCAP_EOSD_FILTER, VFCAP_EOSD_RGBA, VFCAP_EOSD, VOCTRL_DRAW_EOSD, VOCTRL_GET_EOSD_RES, VOCTRL_QUERY_EOSD_FORMAT. Remove draw_osd_with_eosd(), which rendered the OSD by calling VOCTRL_DRAW_EOSD. Change VOs to call osd_draw() directly, which takes a callback as argument. (This basically works like the old OSD API, except multiple OSD bitmap formats are supported and caching is possible.) Remove all mentions of "eosd". It's simply "osd" now. Make OSD size per-OSD-object, as they can be different when using vf_sub. Include display_par/video_par in resolution change detection. Fix the issue with margin borders in vo_corevideo. --- DOCS/man/en/vf.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS/man/en/vf.rst') diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index d46bd5bc06..b5a672e236 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -664,14 +664,14 @@ screenshot ``Taking screenshots`` section for details. ass - Moves SSA/ASS subtitle rendering to an arbitrary point in the filter + Moves subtitle rendering to an arbitrary point in the filter chain, or force subtitle rendering in the video filter as opposed to using - video output EOSD support. See the ``--ass`` option. + video output OSD support. *EXAMPLE*: ``--vf=ass,eq`` - Moves SSA/ASS rendering before the eq filter. This will put both + Moves sub rendering before the eq filter. This will put both subtitle colors and video under the influence of the video equalizer settings. -- cgit v1.2.3 From 773668b6e85d4da4d252cb4ad8abd50448d70c7c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 21 Oct 2012 18:31:34 +0200 Subject: VF: rename vf_ass to vf_sub This reflects the fact that this filter now renders all types of subtitles, not just ASS subtitles. Always compile this filter, not just on CONFIG_ASS. Note that --no-ass still disables auto-inserting this filter. It's the only way to disable auto-insertion, so keep it even though it's not really ASS specific anymore. --no-ass also disables using libass for rendering text subs directly. --- DOCS/man/en/vf.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS/man/en/vf.rst') diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index b5a672e236..31947e82b6 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -663,14 +663,14 @@ screenshot not always safe to insert this filter by default. See the ``Taking screenshots`` section for details. -ass +sub Moves subtitle rendering to an arbitrary point in the filter chain, or force subtitle rendering in the video filter as opposed to using video output OSD support. *EXAMPLE*: - ``--vf=ass,eq`` + ``--vf=sub,eq`` Moves sub rendering before the eq filter. This will put both subtitle colors and video under the influence of the video equalizer settings. -- cgit v1.2.3