diff options
| -rw-r--r-- | DOCS/man/en/vo.rst | 9 | ||||
| -rw-r--r-- | video/out/gl_video.c | 13 | ||||
| -rw-r--r-- | video/out/gl_video.h | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 443fd5ae3c..44b6e05723 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -439,8 +439,13 @@ Available video output drivers are: rgb32f, rgba12, rgba16, rgba16f, rgba32f. Default: rgb. - ``gamma`` - Always enable gamma control. (Disables delayed enabling.) + ``gamma=<0.0..10.0>`` + Set a gamma value. If gamma is adjusted in other ways (like with + the ``--gamma`` option or keybindings and the ``gamma`` property), the + value is multiplied with the other gamma value. + + Setting this value to 1.0 can be used to always enable gamma control. + (Disables delayed enabling.) ``icc-profile=<file>`` Load an ICC profile and use it to transform linear RGB to screen output. diff --git a/video/out/gl_video.c b/video/out/gl_video.c index af1d3e166b..dbd54913ed 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -304,7 +304,7 @@ static int validate_scaler_opt(struct mp_log *log, const m_option_t *opt, #define OPT_BASE_STRUCT struct gl_video_opts const struct m_sub_options gl_video_conf = { .opts = (m_option_t[]) { - OPT_FLAG("gamma", gamma, 0), + OPT_FLOATRANGE("gamma", gamma, 0, 0.0, 10.0), OPT_FLAG("srgb", srgb, 0), OPT_FLAG("npot", npot, 0), OPT_FLAG("pbo", pbo, 0), @@ -566,10 +566,11 @@ static void update_uniforms(struct gl_video *p, GLuint program) gl->Uniform1f(gl->GetUniformLocation(program, "conv_gamma"), p->conv_gamma); + float gamma = p->opts.gamma ? p->opts.gamma : 1.0; gl->Uniform3f(gl->GetUniformLocation(program, "inv_gamma"), - 1.0 / cparams.rgamma, - 1.0 / cparams.ggamma, - 1.0 / cparams.bgamma); + 1.0 / (cparams.rgamma * gamma), + 1.0 / (cparams.ggamma * gamma), + 1.0 / (cparams.bgamma * gamma)); for (int n = 0; n < p->plane_count; n++) { char textures_n[32]; @@ -889,7 +890,7 @@ static void compile_shaders(struct gl_video *p) shader_def(&header_conv, "USE_ALPHA_BLEND", "1"); shader_def_opt(&header_final, "USE_LINEAR_CONV_INV", p->use_lut_3d); - shader_def_opt(&header_final, "USE_GAMMA_POW", p->opts.gamma); + shader_def_opt(&header_final, "USE_GAMMA_POW", p->opts.gamma > 0); shader_def_opt(&header_final, "USE_3DLUT", p->use_lut_3d); shader_def_opt(&header_final, "USE_SRGB", p->opts.srgb); shader_def_opt(&header_final, "USE_DITHER", p->dither_texture != 0); @@ -2205,7 +2206,7 @@ bool gl_video_set_equalizer(struct gl_video *p, const char *name, int val) if (mp_csp_equalizer_set(&p->video_eq, name, val) >= 0) { if (!p->opts.gamma && p->video_eq.values[MP_CSP_EQ_GAMMA] != 0) { MP_VERBOSE(p, "Auto-enabling gamma.\n"); - p->opts.gamma = true; + p->opts.gamma = 1.0f; compile_shaders(p); } update_all_uniforms(p); diff --git a/video/out/gl_video.h b/video/out/gl_video.h index a4f864a9dd..e997e88fb6 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -31,7 +31,7 @@ struct gl_video_opts { char *scalers[2]; float scaler_params[2]; int indirect; - int gamma; + float gamma; int srgb; int scale_sep; int fancy_downscaling; |