From 4d11f32162b08e3b48ae382e2ed0a151035f8aea Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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.
---
 libvo/vo_xv.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'libvo/vo_xv.c')

diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 9aca1005ec..92ac9a2461 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -50,7 +50,6 @@
 #include "x11_common.h"
 #include "fastmemcpy.h"
 #include "sub/sub.h"
-#include "sub/dec_sub.h"
 #include "aspect.h"
 #include "csputils.h"
 #include "subopt-helper.h"
@@ -348,17 +347,14 @@ static void draw_osd(struct vo *vo, struct osd_state *osd)
     struct vo_rect *dst = &ctx->dst_rect;
     double xvpar = (double)dst->width / dst->height * src->height / src->width;
 
-    struct sub_render_params subparams = {
-        .pts = osd->vo_sub_pts,
-        .dim = {
-            .w = ctx->image_width,
-            .h = ctx->image_height,
-            .display_par = vo->monitor_par / xvpar,
-            .video_par = vo->aspdat.par,
-        },
+    struct mp_osd_res res = {
+        .w = ctx->image_width,
+        .h = ctx->image_height,
+        .display_par = vo->monitor_par / xvpar,
+        .video_par = vo->aspdat.par,
     };
 
-    if (osd_draw_on_image(osd, &subparams, 0, &img, &csp))
+    if (osd_draw_on_image(osd, res, osd->vo_pts, 0, &img, &csp))
         ctx->unchanged_image = false;
 }
 
@@ -466,7 +462,7 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
 static int query_format(struct xvctx *ctx, uint32_t format)
 {
     uint32_t i;
-    int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_EOSD | VFCAP_ACCEPT_STRIDE;       // FIXME! check for DOWN
+    int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_OSD | VFCAP_ACCEPT_STRIDE;       // FIXME! check for DOWN
 
     /* check image formats */
     for (i = 0; i < ctx->formats; i++) {
-- 
cgit v1.2.3