sub: fix text subtitle aspect ratio with vo_xv and vo_lavc, refactor

This fixes that vo_xv didn't display text subtitles correctly when
using anamorphic video. It didn't pass the aspect information to the
subtitle renderer. Also, try to render OSD correctly with respect to
aspect ratio settings: on vo_xv, the OSD is rendered into the video,
and needs to be "stretched" too when playing anamorphic video. When
the -monitorpixelaspect option is used, even with VOs such as vo_opengl
the OSD has to be rendered with that aspect ratio.

As preparation for future commits, replace the weird vsfilter_scale
value with a somewhat more sensible video_par member.

Also, struct mp_eosd_res is a better place for the aspect ratio
parameters, as OSD needs this too.

Use osd_draw_on_image() directly in vo_lavc, which fixes aspect ratio
issues as well.

1 files changed, 3 insertions, 4 deletions

diff --git a/sub/sub.c b/sub/sub.c
index 862f5d1f6e..8599002927 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -270,15 +270,14 @@ void draw_osd_with_eosd(struct vo *vo, struct osd_state *osd)
         formats[n] = vo_control(vo, VOCTRL_QUERY_EOSD_FORMAT, &data) == VO_TRUE;
     }
 
-    osd_update_ext(osd, dim);
+    dim.display_par = vo->monitor_par;
+    dim.video_par = vo->aspdat.par;
 
-    struct aspect_data asp = vo->aspdat;
+    osd_update_ext(osd, dim);
 
     struct sub_render_params subparams = {
         .pts = osd->vo_sub_pts,
         .dim = dim,
-        .normal_scale = 1,
-        .vsfilter_scale = (double) asp.prew / asp.preh * asp.orgh / asp.orgw,
     };
 
     for (int n = 0; n < MAX_OSD_PARTS; n++) {