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, 3 insertions, 8 deletions

diff --git a/sub/dec_sub.h b/sub/dec_sub.h
index 389851503e..f66f05c021 100644
--- a/sub/dec_sub.h
+++ b/sub/dec_sub.h
@@ -4,16 +4,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "sub.h"
+#include "sub/sub.h"
 
 struct sh_sub;
 struct ass_track;
-struct MPOpts *opts;
-
-struct sub_render_params {
-    double pts;
-    struct mp_eosd_res dim;
-};
+struct MPOpts;
 
 static inline bool is_text_sub(int type)
 {
@@ -22,7 +17,7 @@ static inline bool is_text_sub(int type)
 
 void sub_decode(struct sh_sub *sh, struct osd_state *osd, void *data,
                 int data_len, double pts, double duration);
-void sub_get_bitmaps(struct osd_state *osd, struct sub_render_params *params,
+void sub_get_bitmaps(struct osd_state *osd, struct mp_osd_res dim, double pts,
                      struct sub_bitmaps *res);
 void sub_init(struct sh_sub *sh, struct osd_state *osd);
 void sub_reset(struct sh_sub *sh, struct osd_state *osd);