summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorKacper Michajłow <kasper93@gmail.com>2023-11-04 00:52:14 +0100
committersfan5 <sfan5@live.de>2023-11-05 18:57:36 +0100
commit73fbe09a49d3ed00c6e19fdcc658802f28974ae2 (patch)
tree8a39d61582d5e951547a6ce97638929c5f342e84 /demux
parentd9a483cb17cf5239546fec2462b4c2ccca579723 (diff)
downloadmpv-73fbe09a49d3ed00c6e19fdcc658802f28974ae2.tar.bz2
mpv-73fbe09a49d3ed00c6e19fdcc658802f28974ae2.tar.xz
ALL: use pl_hdr_metadata and nuke sig_peak
This commit replaces all uses of sig_peak and maps all HDR metadata. Form notable changes mixed usage of maxCLL and max_luma is resolved and not always max_luma is used which makes vo_gpu and vo_gpu_next behave the same way.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 1814a7efd2..41226c56ba 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -594,7 +594,6 @@ static void parse_trackcolour(struct demuxer *demuxer, struct mkv_track *track,
}
if (colour->n_max_cll) {
track->color.hdr.max_cll = colour->max_cll;
- track->color.sig_peak = track->color.hdr.max_cll / MP_REF_WHITE;
MP_DBG(demuxer, "| + MaxCLL: %"PRIu64"\n", colour->max_cll);
}
if (colour->n_max_fall) {
@@ -642,8 +641,6 @@ static void parse_trackcolour(struct demuxer *demuxer, struct mkv_track *track,
}
if (mastering->n_luminance_max) {
track->color.hdr.max_luma = mastering->luminance_max;
- if (!track->color.sig_peak)
- track->color.sig_peak = track->color.hdr.max_luma / MP_REF_WHITE;
MP_DBG(demuxer, "| + LuminanceMax: %f\n", track->color.hdr.max_luma);
}
}