From bf6eadb7b8dc4073a940cdf9327323366b9e11e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 13:58:04 +0100 Subject: Various changes to colour conversion specification to use chromaticities. --- src/lib/config.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/config.cc') diff --git a/src/lib/config.cc b/src/lib/config.cc index c75eaa0f5..4d24d676b 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -83,6 +83,7 @@ Config::set_defaults () _win32_console = false; #endif + _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); _allowed_dcp_frame_rates.push_back (30); @@ -90,7 +91,9 @@ Config::set_defaults () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); + _colour_conversions.clear (); _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ())); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ())); set_kdm_email_to_default (); -- cgit v1.2.3 From 20a733fe6782eff04622b5bd189417f391b9cfb9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 15:59:36 +0100 Subject: Add P3 colour conversion preset. --- ChangeLog | 2 ++ cscript | 2 +- src/lib/config.cc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/config.cc') diff --git a/ChangeLog b/ChangeLog index 104a99a00..183ebc341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-04-22 c.hetherington + * Add P3 colour conversion preset. + * Hand-apply all changes relating to colour specification as chromaticity. diff --git a/cscript b/cscript index 0ea227edd..f3387e78a 100644 --- a/cscript +++ b/cscript @@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', 'f69bb08'), - ('libdcp', 'b223c57'), + ('libdcp', 'fa1dddf'), ('libsub', 'f66b11f')) def build(target, options): diff --git a/src/lib/config.cc b/src/lib/config.cc index 4d24d676b..ab57c1afc 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -95,6 +95,7 @@ Config::set_defaults () _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ())); + _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ())); set_kdm_email_to_default (); } -- cgit v1.2.3