RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-28 10:33:20 +00:00
Code Issues Releases Wiki Activity

aspect: remove useless debug messages

Browse Source 
Never needed them. This makes the code slightly more readable.
This commit is contained in:
wm4 2016-04-10 16:29:33 +02:00
parent 87cb2339a6
commit b18bfd0352
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/aspect.c
View File

@ -26,28 +26,20 @@
#include "vo.h" #include "vo.h"
#include "sub/osd.h" #include "sub/osd.h"
static void aspect_calc_panscan(struct mp_log *log, struct mp_vo_opts *opts, static void aspect_calc_panscan(struct mp_vo_opts *opts,
int w, int h, int d_w, int d_h, int w, int h, int d_w, int d_h,
int window_w, int window_h, double monitor_par, int window_w, int window_h, double monitor_par,
int *out_w, int *out_h) 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 fwidth = window_w;
int fheight = (float)window_w / d_w * d_h / monitor_par; 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) { if (fheight > window_h || fheight < h) {
int tmpw = (float)window_h / d_h * d_w * monitor_par; int tmpw = (float)window_h / d_h * d_w * monitor_par;
if (tmpw <= window_w) { if (tmpw <= window_w) {
fheight = window_h; fheight = window_h;
fwidth = tmpw; 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; int vo_panscan_area = window_h - fheight;
double f_w = fwidth / (double)fheight; double f_w = fwidth / (double)fheight;
@ -153,7 +145,7 @@ void mp_get_src_dst_rects(struct mp_log *log, struct mp_vo_opts *opts,
}; };
if (opts->keepaspect) { if (opts->keepaspect) {
int scaled_width, scaled_height; 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,
window_w, window_h, monitor_par, window_w, window_h, monitor_par,
&scaled_width, &scaled_height); &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->unscaled,