From 48c38f730d87b105716d9321a375175d2f01d401 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 5 Sep 2018 19:48:50 +0200 Subject: mp_image: strip all HDR peak information from SDR clips By overriding it with 1.0 (aka SDR). This prevents blowing up on mistagged clips. Fixes #6111 --- video/mp_image.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/video/mp_image.c b/video/mp_image.c index eadff83e5b..92c3e57b95 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -812,6 +812,12 @@ void mp_image_params_guess_csp(struct mp_image_params *params) } } + if (!mp_trc_is_hdr(params->color.gamma)) { + // Some clips have leftover HDR metadata after conversion to SDR, so to + // avoid blowing up the tone mapping code, strip/sanitize it + params->color.sig_peak = 1.0; + } + if (params->chroma_location == MP_CHROMA_AUTO) { if (params->color.levels == MP_CSP_LEVELS_TV) params->chroma_location = MP_CHROMA_LEFT; -- cgit v1.2.3