#include "config.h"
#include "colour_conversion.h"
#include "util.h"
-#include "md5_digester.h"
-#include "raw_convert.h"
+#include "digester.h"
+#include <dcp/raw_convert.h>
#include <dcp/chromaticity.h>
-#include <dcp/colour_matrix.h>
#include <dcp/gamma_transfer_function.h>
#include <dcp/modified_gamma_transfer_function.h>
+#include <dcp/identity_transfer_function.h>
+#include <dcp/s_gamut3_transfer_function.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
vector<PresetColourConversion> PresetColourConversion::_presets;
in_node->number_child<double> ("A"),
in_node->number_child<double> ("B")
));
+ } else if (in_type == "SGamut3") {
+ _in.reset (new dcp::SGamut3TransferFunction ());
}
} else {
}
}
- _out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
+ optional<double> gamma = node->optional_number_child<double> ("OutputGamma");
+ if (gamma) {
+ _out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
+ } else {
+ _out.reset (new dcp::IdentityTransferFunction ());
+ }
}
boost::optional<ColourConversion>
in_node->add_child("Threshold")->add_child_text (raw_convert<string> (tf->threshold ()));
in_node->add_child("A")->add_child_text (raw_convert<string> (tf->A ()));
in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
+ } else if (dynamic_pointer_cast<const dcp::SGamut3TransferFunction> (_in)) {
+ in_node->add_child("Type")->add_child_text ("SGamut3");
}
- node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (_yuv_to_rgb));
+ node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (static_cast<int> (_yuv_to_rgb)));
node->add_child("RedX")->add_child_text (raw_convert<string> (_red.x));
node->add_child("RedY")->add_child_text (raw_convert<string> (_red.y));
node->add_child("GreenX")->add_child_text (raw_convert<string> (_green.x));
node->add_child("AdjustedWhiteY")->add_child_text (raw_convert<string> (_adjusted_white.get().y));
}
- node->add_child("OutputGamma")->add_child_text (raw_convert<string> (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ()));
+ if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)) {
+ shared_ptr<const dcp::GammaTransferFunction> gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+ node->add_child("OutputGamma")->add_child_text (raw_convert<string> (gf->gamma ()));
+ }
}
optional<size_t>
string
ColourConversion::identifier () const
{
- MD5Digester digester;
+ Digester digester;
if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in)) {
shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
digester.add (_adjusted_white.get().y);
}
- digester.add (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ());
+ shared_ptr<const dcp::GammaTransferFunction> gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+ if (gf) {
+ digester.add (gf->gamma ());
+ }
return digester.get ();
}
_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 ()));
+ _presets.push_back (PresetColourConversion (_("S-Gamut3/S-Log3"), "sgamut3", dcp::ColourConversion::s_gamut3_to_xyz ()));
}
PresetColourConversion