vo: merge get rid of vo.aspdat field

Rename vo_get_src_dst_rects() to mp_get_src_dst_rects() and make it
independent from the VO (it takes a comical amount of parameters now to
pass all required state). Add a convenience wrapper with the name
vo_get_src_dst_rects() to vo.c. Replace all aspdat and vo usages with
immediate parameters.

Functionally, nothing should change, except that the window size is
clamped to a minimum of size 1 much earlier, and some log messages
change the prefix (don't bother with vo.vo_log stuff).

1 files changed, 4 insertions, 13 deletions

diff --git a/video/out/vo.h b/video/out/vo.h
index 900fc96e28..df5ef5ecd9 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -221,9 +221,6 @@ struct vo_driver {
 };
 
 struct vo {
-    struct {
-        struct mp_log *log; // Using "[vo]" as prefix
-    } vo_log;
     struct mp_log *log; // Using e.g. "[vo/vdpau]" as prefix
     int config_ok;      // Last config call was successful?
     int config_count;   // Total number of successful config calls
@@ -260,20 +257,14 @@ struct vo {
     // requested position/resolution (usually window position/window size)
     int dx;
     int dy;
-    int dwidth;
-    int dheight;
 
     int xinerama_x;
     int xinerama_y;
-    float monitor_par;
 
-    struct aspect_data {
-        int orgw; // real width         (same as params->w and h)
-        int orgh; // real height
-        int prew; // prescaled width    (same as params->d_w and d_h)
-        int preh; // prescaled height
-        float par; // pixel aspect ratio out of orgw/orgh and prew/preh
-    } aspdat;
+    // current window state
+    int dwidth;
+    int dheight;
+    float monitor_par;
 
     char *window_title;
 };