Speculative Rec 1886/2020 presets.

diff --git a/ChangeLog b/ChangeLog
index bf30c5f1c846a80ed57bc4571bb986a524b32947..8c58805ff437c84c12c64a78a0338e9859e5987e 100644 (file)
--- 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 e969a523614b349f9911d4f6fb43564bb2872636..69ba00418098d52807da238864d475b19f70f914 100644 (file)
--- 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 0625f059b21089924fd5d543914948c62d07c09c..1ced7486c54a522265f0c45600c8c99f29078d27 100644 (file)
--- 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