diff options
| author | wm4 <wm4@nowhere> | 2020-06-03 17:26:08 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2020-06-03 17:26:44 +0200 |
| commit | 5f49009849271ecd995f9f41e4eb2a36a0fc024a (patch) | |
| tree | e3c0dc420eef17af7bafe8406aa22998123ce4d3 /video | |
| parent | baa7b5c8dd35365a8a62aa39c84394e5315b79e0 (diff) | |
| download | mpv-5f49009849271ecd995f9f41e4eb2a36a0fc024a.tar.bz2 mpv-5f49009849271ecd995f9f41e4eb2a36a0fc024a.tar.xz | |
options: add --video-scale-x/y
Requested.
Fixes: #6303
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/aspect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c index 7307ed6b34..c07fdce84a 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -77,12 +77,12 @@ 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, - float zoom, float align, float pan, + float zoom, float align, float pan, float scale, int *src_start, int *src_end, int *dst_start, int *dst_end, int *osd_margin_a, int *osd_margin_b) { - scaled_src_size *= powf(2, zoom); + scaled_src_size *= powf(2, zoom) * scale; align = (align + 1) / 2; *src_start = 0; @@ -168,11 +168,11 @@ void mp_get_src_dst_rects(struct mp_log *log, struct mp_vo_opts *opts, vid_window_w, vid_window_h, monitor_par, &scaled_width, &scaled_height); src_dst_split_scaling(src_w, vid_window_w, scaled_width, - opts->zoom, opts->align_x, opts->pan_x, + opts->zoom, opts->align_x, opts->pan_x, opts->scale_x, &src.x0, &src.x1, &dst.x0, &dst.x1, &osd.ml, &osd.mr); src_dst_split_scaling(src_h, vid_window_h, scaled_height, - opts->zoom, opts->align_y, opts->pan_y, + opts->zoom, opts->align_y, opts->pan_y, opts->scale_y, &src.y0, &src.y1, &dst.y0, &dst.y1, &osd.mt, &osd.mb); } |