diff options
author | Niklas Haas <git@nand.wakku.to> | 2015-02-28 20:15:12 +0100 |
---|---|---|
committer | Niklas Haas <git@nand.wakku.to> | 2015-02-28 20:23:47 +0100 |
commit | a76cc1dafcf948cce93f6d258e33444206a83c45 (patch) | |
tree | 89e3bb2afb4192ee1e8f54aa9943927535845269 /video/mp_image.c | |
parent | 8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab (diff) | |
download | mpv-a76cc1dafcf948cce93f6d258e33444206a83c45.tar.bz2 mpv-a76cc1dafcf948cce93f6d258e33444206a83c45.tar.xz |
Revert "Revert recent vo_opengl related commits"
Omitted a simple, but devastasting check. Fixed the relevant commits
now.
This reverts commit 8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab.
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 9c8a643..f1ea03e 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1034,9 +1034,9 @@ static void compile_shaders(struct gl_video *p)
shader_def_opt(&header_conv, "USE_CONV_GAMMA", use_conv_gamma);
shader_def_opt(&header_conv, "USE_CONST_LUMA", use_const_luma);
shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_BT1886",
- gamma_fun == MP_CSP_TRC_BT_1886);
+ use_linear_light && gamma_fun == MP_CSP_TRC_BT_1886);
shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_SRGB",
- gamma_fun == MP_CSP_TRC_SRGB);
+ use_linear_light && gamma_fun == MP_CSP_TRC_SRGB);
shader_def_opt(&header_conv, "USE_SIGMOID", use_sigmoid);
if (p->opts.alpha_mode > 0 && p->has_alpha && p->plane_count > 3)
shader_def(&header_conv, "USE_ALPHA_PLANE", "3");
Diffstat (limited to 'video/mp_image.c')
-rw-r--r-- | video/mp_image.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index 44f5ab903c..fcf265f699 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -368,10 +368,11 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src) dst->params.d_w = src->params.d_w; dst->params.d_h = src->params.d_h; } + dst->params.primaries = src->params.primaries; + dst->params.gamma = src->params.gamma; if ((dst->flags & MP_IMGFLAG_YUV) == (src->flags & MP_IMGFLAG_YUV)) { dst->params.colorspace = src->params.colorspace; dst->params.colorlevels = src->params.colorlevels; - dst->params.primaries = src->params.primaries; dst->params.chroma_location = src->params.chroma_location; dst->params.outputlevels = src->params.outputlevels; } @@ -516,6 +517,7 @@ bool mp_image_params_equal(const struct mp_image_params *p1, p1->colorlevels == p2->colorlevels && p1->outputlevels == p2->outputlevels && p1->primaries == p2->primaries && + p1->gamma == p2->gamma && p1->chroma_location == p2->chroma_location && p1->rotate == p2->rotate && p1->stereo_in == p2->stereo_in && @@ -578,6 +580,8 @@ void mp_image_params_guess_csp(struct mp_image_params *params) params->primaries = mp_csp_guess_primaries(params->w, params->h); } } + if (params->gamma == MP_CSP_TRC_AUTO) + params->gamma = MP_CSP_TRC_BT_1886; } else if (fmt.flags & MP_IMGFLAG_RGB) { params->colorspace = MP_CSP_RGB; params->colorlevels = MP_CSP_LEVELS_PC; @@ -589,6 +593,8 @@ void mp_image_params_guess_csp(struct mp_image_params *params) // Note: sRGB primaries = BT.709 primaries if (params->primaries == MP_CSP_PRIM_AUTO) params->primaries = MP_CSP_PRIM_BT_709; + if (params->gamma == MP_CSP_TRC_AUTO) + params->gamma = MP_CSP_TRC_SRGB; } else if (fmt.flags & MP_IMGFLAG_XYZ) { params->colorspace = MP_CSP_XYZ; params->colorlevels = MP_CSP_LEVELS_PC; @@ -603,11 +609,14 @@ void mp_image_params_guess_csp(struct mp_image_params *params) // tagged with. if (params->primaries == MP_CSP_PRIM_AUTO) params->primaries = MP_CSP_PRIM_BT_709; + if (params->gamma == MP_CSP_TRC_AUTO) + params->gamma = MP_CSP_TRC_LINEAR; } else { // We have no clue. params->colorspace = MP_CSP_AUTO; params->colorlevels = MP_CSP_LEVELS_AUTO; params->primaries = MP_CSP_PRIM_AUTO; + params->gamma = MP_CSP_TRC_AUTO; } } |