Skip to content

Commit b63ddf6

Browse files
committed
Синхронизация файлов csputils.h/cpp с кодом mpv.
1 parent 08b661f commit b63ddf6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Source/csputils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ static void mp_get_xyz2rgb_coeffs(struct mp_csp_params *params,
320320

321321
// All non-absolute mappings want to map source white to target white
322322
if (intent != MP_INTENT_ABSOLUTE_COLORIMETRIC) {
323-
// SMPTE 428-1 defines the calibration white point as CIE xy (0.314, 0.351)
324-
static const struct mp_csp_col_xy smpte428 = {0.314, 0.351};
325-
mp_apply_chromatic_adaptation(smpte428, prim.white, m->m);
323+
// SMPTE EG 432-1 Annex H defines the white point as equal energy
324+
static const struct mp_csp_col_xy smpte432 = {1.0/3.0, 1.0/3.0};
325+
mp_apply_chromatic_adaptation(smpte432, prim.white, m->m);
326326
}
327327

328328
// Since this outputs linear RGB rather than companded RGB, we

Source/csputils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct mp_colorspace {
9595
enum mp_csp_prim primaries;
9696
enum mp_csp_trc gamma;
9797
enum mp_csp_light light;
98-
float sig_peak; // highest relative value in signal. 0 = unknown/auto
98+
//struct pl_hdr_metadata hdr;
9999
};
100100

101101
// For many colorspace conversions, in particular those involving HDR, an

0 commit comments

Comments
 (0)