summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-24 12:26:02 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-24 12:26:02 +0100
commit3a05b2ea7ed62ca5a6ef55bcc90efeed84c5bbf1 (patch)
tree24aabdadc2861658c90aedb614a4f89e7ddc8df8
parent93d57d46e52e0050efda894fc3089a6410d55754 (diff)
Speculative Rec 1886/2020 presets.
-rw-r--r--ChangeLog3
-rw-r--r--cscript2
-rw-r--r--src/lib/colour_conversion.cc2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf30c5f1c..8c58805ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2016-05-24 c.hetherington <cth@carlh.net>
+ * Add somewhat speculative Rec 1886 and Rec 2020
+ colour conversion presets (#832).
+
* Disallow referencing of Interop DCPs in SMPTE
films, and vice versa (#804).
diff --git a/cscript b/cscript
index e969a5236..69ba00418 100644
--- a/cscript
+++ b/cscript
@@ -236,7 +236,7 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
- ('libdcp', '043d382'),
+ ('libdcp', '85c699d'),
('libsub', 'b082fb6'))
def configure_options(target):
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 0625f059b..1ced7486c 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -264,6 +264,8 @@ PresetColourConversion::setup_colour_conversion_presets ()
_presets.push_back (PresetColourConversion (_("Rec. 601"), "rec601", dcp::ColourConversion::rec601_to_xyz ()));
_presets.push_back (PresetColourConversion (_("Rec. 709"), "rec709", dcp::ColourConversion::rec709_to_xyz ()));
_presets.push_back (PresetColourConversion (_("P3"), "p3", dcp::ColourConversion::p3_to_xyz ()));
+ _presets.push_back (PresetColourConversion (_("Rec. 1886"), "rec1886", dcp::ColourConversion::rec1886_to_xyz ()));
+ _presets.push_back (PresetColourConversion (_("Rec. 2020"), "rec2020", dcp::ColourConversion::rec2020_to_xyz ()));
}
PresetColourConversion