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.

1 files changed, 2 insertions, 5 deletions

diff --git a/sub/sd.h b/sub/sd.h
index b286d3691b..29f021ab5e 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -1,17 +1,14 @@
 #ifndef MPLAYER_SD_H
 #define MPLAYER_SD_H
 
-struct osd_state;
-struct sub_render_params;
-struct sh_sub;
-struct sub_bitmaps;
+#include "dec_sub.h"
 
 struct sd_functions {
     int  (*init)(struct sh_sub *sh, struct osd_state *osd);
     void (*decode)(struct sh_sub *sh, struct osd_state *osd,
                    void *data, int data_len, double pts, double duration);
     void (*get_bitmaps)(struct sh_sub *sh, struct osd_state *osd,
-                        struct sub_render_params *params,
+                        struct mp_osd_res dim, double pts,
                         struct sub_bitmaps *res);
     void (*reset)(struct sh_sub *sh, struct osd_state *osd);
     void (*switch_off)(struct sh_sub *sh, struct osd_state *osd);