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 +++--- DOCS/man/en/vo.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'DOCS') 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. diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 6248073944..09d12e2994 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -171,8 +171,8 @@ direct3d_shaders (Windows only) Never render YUV video with more than 8 bits per component. (Using this flag will force software conversion to 8 bit.) - disable-eosd - Disable EOSD rendering for subtitles. + disable-osd + Disable OSD rendering for subtitles. (Using this flag might force the insertion of the 'ass' video filter, which will render the subtitles in software.) -- cgit v1.2.3