1 files changed, 15 insertions, 32 deletions

diff --git a/video/out/aspect.c b/video/out/aspect.c
index 2d25bbdfd5..205ee3b89f 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -17,6 +17,7 @@
 
 /* Stuff for correct aspect scaling. */
 #include "aspect.h"
+#include "math.h"
 #include "vo.h"
 #include "common/msg.h"
 #include "options/options.h"
@@ -25,38 +26,36 @@
 #include "vo.h"
 #include "sub/osd.h"
 
-static void aspect_calc_panscan(struct mp_log *log, struct mp_vo_opts *opts,
-                                int w, int h, int d_w, int d_h,
+static void aspect_calc_panscan(struct mp_vo_opts *opts,
+                                int w, int h, int d_w, int d_h, bool unscaled,
                                 int window_w, int window_h, double monitor_par,
                                 int *out_w, int *out_h)
 {
-    mp_dbg(log, "aspect(0) fitin: %dx%d monitor_par: %.2f\n",
-           window_w, window_h, monitor_par);
     int fwidth = window_w;
     int fheight = (float)window_w / d_w * d_h / monitor_par;
-    mp_dbg(log, "aspect(1) wh: %dx%d (org: %dx%d)\n",
-           fwidth, fheight, d_w, d_h);
     if (fheight > window_h || fheight < h) {
         int tmpw = (float)window_h / d_h * d_w * monitor_par;
         if (tmpw <= window_w) {
             fheight = window_h;
             fwidth = tmpw;
-        } else if (fheight > window_h) {
-            mp_warn(log, "No suitable new aspect found!\n");
         }
     }
-    mp_dbg(log, "aspect(2) wh: %dx%d (org: %dx%d)\n",
-           fwidth, fheight, d_w, d_h);
 
     int vo_panscan_area = window_h - fheight;
     double f_w = fwidth / (double)fheight;
     double f_h = 1;
-    if (!vo_panscan_area) {
+    if (vo_panscan_area == 0) {
         vo_panscan_area = window_w - fwidth;
         f_w = 1;
         f_h = fheight / (double)fwidth;
     }
 
+    if (unscaled) {
+        fwidth = w * monitor_par;
+        fheight = h;
+        vo_panscan_area = 0;
+    }
+
     *out_w = fwidth + vo_panscan_area * opts->panscan * f_w;
     *out_h = fheight + vo_panscan_area * opts->panscan * f_h;
 }
@@ -73,18 +72,13 @@ static void clamp_size(int size, int *start, int *end)
 }
 
 static void src_dst_split_scaling(int src_size, int dst_size,
-                                  int scaled_src_size, bool unscaled,
+                                  int scaled_src_size,
                                   float zoom, float align, float pan,
                                   int *src_start, int *src_end,
                                   int *dst_start, int *dst_end,
                                   int *osd_margin_a, int *osd_margin_b)
 {
-    if (unscaled) {
-        scaled_src_size = src_size;
-        zoom = 0.0;
-    }
-
-    scaled_src_size += zoom * scaled_src_size;
+    scaled_src_size *= powf(2, zoom);
     align = (align + 1) / 2;
 
     *src_start = 0;
@@ -110,17 +104,6 @@ static void src_dst_split_scaling(int src_size, int dst_size,
         *dst_end = dst_size;
     }
 
-    if (unscaled) {
-        // Force unscaled by reducing the range for src or dst
-        int src_s = *src_end - *src_start;
-        int dst_s = *dst_end - *dst_start;
-        if (src_s > dst_s) {
-            *src_end = *src_start + dst_s;
-        } else if (src_s < dst_s) {
-            *dst_end = *dst_start + src_s;
-        }
-    }
-
     // For sanity: avoid bothering VOs with corner cases
     clamp_size(src_size, src_start, src_end);
     clamp_size(dst_size, dst_start, dst_end);
@@ -152,14 +135,14 @@ void mp_get_src_dst_rects(struct mp_log *log, struct mp_vo_opts *opts,
     };
     if (opts->keepaspect) {
         int scaled_width, scaled_height;
-        aspect_calc_panscan(log, opts, src_w, src_h, src_dw, src_dh,
+        aspect_calc_panscan(opts, src_w, src_h, src_dw, src_dh, opts->unscaled,
                             window_w, window_h, monitor_par,
                             &scaled_width, &scaled_height);
-        src_dst_split_scaling(src_w, window_w, scaled_width, opts->unscaled,
+        src_dst_split_scaling(src_w, window_w, scaled_width,
                               opts->zoom, opts->align_x, opts->pan_x,
                               &src.x0, &src.x1, &dst.x0, &dst.x1,
                               &osd.ml, &osd.mr);
-        src_dst_split_scaling(src_h, window_h, scaled_height, opts->unscaled,
+        src_dst_split_scaling(src_h, window_h, scaled_height,
                               opts->zoom, opts->align_y, opts->pan_y,
                               &src.y0, &src.y1, &dst.y0, &dst.y1,
                               &osd.mt, &osd.mb);