diff options
| author | wm4 <wm4@nowhere> | 2012-10-19 19:25:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:34 +0200 |
| commit | 4d11f32162b08e3b48ae382e2ed0a151035f8aea (patch) | |
| tree | c588341bf672fd935de45a05bef99e0d8f20892f /libvo/vo_x11.c | |
| parent | a4f9077f6c1a897120616cc70c1ca37c6a247be2 (diff) | |
| download | mpv-4d11f32162b08e3b48ae382e2ed0a151035f8aea.tar.bz2 mpv-4d11f32162b08e3b48ae382e2ed0a151035f8aea.tar.xz | |
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.
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 61066a2ec6..587730a89a 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -42,7 +42,6 @@ #endif #include "sub/sub.h" -#include "sub/dec_sub.h" #include "libmpcodecs/sws_utils.h" #define MODE_RGB 0x1 @@ -443,17 +442,14 @@ static void draw_osd(struct vo *vo, struct osd_state *osd) struct mp_csp_details csp = MP_CSP_DETAILS_DEFAULTS; - struct sub_render_params subparams = { - .pts = osd->vo_sub_pts, - .dim = { - .w = img.w, - .h = img.h, - .display_par = vo->monitor_par, - .video_par = vo->aspdat.par, - }, + struct mp_osd_res res = { + .w = img.w, + .h = img.h, + .display_par = vo->monitor_par, + .video_par = vo->aspdat.par, }; - osd_draw_on_image(osd, &subparams, 0, &img, &csp); + osd_draw_on_image(osd, res, osd->vo_pts, 0, &img, &csp); } static void flip_page(struct vo *vo) |