From bd1fb6f9b13f2b70a0bfcd0b6be3e16917dfd8bb Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 25 Jan 2016 21:35:39 +0100 Subject: vo_opengl: default scaler-resizes-only sub-option to yes Often requested. The main argument, that prominent scalers like sharpen change the image even if no scaling happens, disappeared anyway. ("sharpen", unsharp masking, is neither prominent nor a scaler anymore. This is an artifact from MPlayer, which fuses unsharp masking with bilinear scaling in order to make it single-pass, or so.) --- DOCS/interface-changes.rst | 1 + DOCS/man/vo.rst | 2 +- video/out/opengl/video.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index ee7d2cbe4d..956798889e 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -27,6 +27,7 @@ Interface changes the old default) - VO opengl custom shaders must now use "sample_pixel" as function name, instead of "sample" + - change VO opengl scaler-resizes-only default to enabled --- mpv 0.15.0 --- - change "yadif" video filter defaults --- mpv 0.14.0 --- diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 4f2641a11e..96ba0049ca 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -444,7 +444,7 @@ Available video output drivers are: Disable the scaler if the video image is not resized. In that case, ``bilinear`` is used instead whatever is set with ``scale``. Bilinear will reproduce the source image perfectly if no scaling is performed. - Note that this option never affects ``cscale``. + Enabled by default. Note that this option never affects ``cscale``. ``pbo`` Enable use of PBOs. On some drivers this can be faster, especially if diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 69b910e7e5..8a23b2570b 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -337,6 +337,7 @@ const struct gl_video_opts gl_video_opts_def = { {{"mitchell", .params={NAN, NAN}}, {.params = {NAN, NAN}}, .clamp = 1, }, // tscale }, + .scaler_resizes_only = 1, .scaler_lut_size = 6, .alpha_mode = 3, .background = {0, 0, 0, 255}, @@ -361,6 +362,7 @@ const struct gl_video_opts gl_video_opts_hq_def = { {{"mitchell", .params={NAN, NAN}}, {.params = {NAN, NAN}}, .clamp = 1, }, // tscale }, + .scaler_resizes_only = 1, .scaler_lut_size = 6, .alpha_mode = 3, .background = {0, 0, 0, 255}, -- cgit v1.2.3