sub: cosmetics: move things around

Move sub-bitmap definitions from dec_sub.h to sub.h. While it's a bit
odd that OSD data structures are in a file named sub.h, it's definitely
way too strange to have them in a file about subtitle decoding. (Maybe
sub.h/.c and the sub/ directory should be split out and renamed "osd"
at a later point.)

Remove including ass_mp.h (and the libass headers) where possible.

Remove typedefs for mp_eosd_res and sub_bitmaps structs.

Store a mp_eosd_res struct in osd_state instead of just w/h. Note that
sbtitles might be rendered using different sizes/margins when filters
are involved (the subtitle renderer is not supposed to use the OSD res
directly, and the "dim" member removed in the previous commit is
something different).

5 files changed, 5 insertions, 9 deletions

diff --git a/libvo/bitmap_packer.c b/libvo/bitmap_packer.c
index 9d3df70c34..603a6ce410 100644
--- a/libvo/bitmap_packer.c
+++ b/libvo/bitmap_packer.c
@@ -28,7 +28,6 @@
 #include "bitmap_packer.h"
 #include "mp_msg.h"
 #include "mpcommon.h"
-#include "sub/ass_mp.h"
 #include "sub/dec_sub.h"
 #include "fastmemcpy.h"
 
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 37a16fec5e..e5c74f6cc8 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -333,7 +333,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
             return mpgl_osd_query_format(p->osd, *(int *)data)
                    ? VO_TRUE : VO_NOTIMPL;
         case VOCTRL_GET_EOSD_RES: {
-            mp_eosd_res_t *r = data;
+            struct mp_eosd_res *r = data;
             r->w = vo->dwidth;
             r->h = vo->dheight;
             r->mt = r->mb = r->ml = r->mr = 0;
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 7ad5fe31e3..d41adad6bc 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -42,7 +42,6 @@
 #include "gl_osd.h"
 #include "aspect.h"
 #include "fastmemcpy.h"
-#include "sub/ass_mp.h"
 
 //for gl_priv.use_yuv
 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE))
@@ -1096,7 +1095,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
     case VOCTRL_QUERY_EOSD_FORMAT:
         return mpgl_osd_query_format(p->osd, *(int *)data) ? VO_TRUE : VO_NOTIMPL;
     case VOCTRL_GET_EOSD_RES: {
-        mp_eosd_res_t *r = data;
+        struct mp_eosd_res *r = data;
         r->w = vo->dwidth;
         r->h = vo->dheight;
         r->mt = r->mb = r->ml = r->mr = 0;
diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c
index 66324281ba..f3c1767b78 100644
--- a/libvo/vo_gl3.c
+++ b/libvo/vo_gl3.c
@@ -54,7 +54,6 @@
 #include "filter_kernels.h"
 #include "aspect.h"
 #include "fastmemcpy.h"
-#include "sub/ass_mp.h"
 
 static const char vo_gl3_shaders[] =
 // Generated from libvo/vo_gl3_shaders.glsl
@@ -1689,7 +1688,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
         draw_eosd(p, data);
         return VO_TRUE;
     case VOCTRL_GET_EOSD_RES: {
-        mp_eosd_res_t *r = data;
+        struct mp_eosd_res *r = data;
         r->w = vo->dwidth;
         r->h = vo->dheight;
         r->ml = r->mr = p->border_x;
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 1e587810ac..34aa9824dc 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -51,7 +51,6 @@
 #include "libmpcodecs/vfcap.h"
 #include "libmpcodecs/mp_image.h"
 #include "osdep/timer.h"
-#include "sub/ass_mp.h"
 #include "bitmap_packer.h"
 
 #define WRAP_ADD(x, a, m) ((a) < 0 \
@@ -984,7 +983,7 @@ static void draw_eosd(struct vo *vo, int index)
     }
 }
 
-static void generate_eosd(struct vo *vo, mp_eosd_images_t *imgs)
+static void generate_eosd(struct vo *vo, struct sub_bitmaps *imgs)
 {
     struct vdpctx *vc = vo->priv;
     struct vdp_functions *vdp = vc->vdp;
@@ -1617,7 +1616,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
         if (!data)
             return VO_FALSE;
         if (status_ok(vo)) {
-            mp_eosd_images_t *imgs = data;
+            struct sub_bitmaps *imgs = data;
             generate_eosd(vo, imgs);
             draw_eosd(vo, imgs->render_index);
         }