X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.cc;h=18fa1b173d556b2c856b528a4e8afd576353629a;hb=d5ec30b6d746177e97707085b9e6b709e41ecc20;hp=913b8b507175829e90999fed8a71e374dcaced1d;hpb=8411002d2c768dfaaa4b89cf6a2b12b3967f1f69;p=libdcp.git diff --git a/src/util.cc b/src/util.cc index 913b8b50..18fa1b17 100644 --- a/src/util.cc +++ b/src/util.cc @@ -26,7 +26,13 @@ #include #include #include +#include #include +#include +#include +#include +#include +#include #include "KM_util.h" #include "KM_fileio.h" #include "AS_DCP.h" @@ -34,12 +40,22 @@ #include "exceptions.h" #include "types.h" #include "argb_frame.h" -#include "lut.h" +#include "certificates.h" +#include "gamma_lut.h" -using namespace std; -using namespace boost; +using std::string; +using std::cout; +using std::stringstream; +using std::min; +using std::max; +using std::list; +using boost::shared_ptr; +using boost::lexical_cast; using namespace libdcp; +/** Create a UUID. + * @return UUID. + */ string libdcp::make_uuid () { @@ -50,14 +66,17 @@ libdcp::make_uuid () return string (buffer); } + +/** Create a digest for a file. + * @param filename File name. + * @return Digest. + */ string -libdcp::make_digest (string filename, sigc::signal1* progress) +libdcp::make_digest (string filename) { - int const file_size = filesystem::file_size (filename); - Kumu::FileReader reader; if (ASDCP_FAILURE (reader.OpenRead (filename.c_str ()))) { - throw FileError ("could not open file to compute digest", filename); + boost::throw_exception (FileError ("could not open file to compute digest", filename)); } SHA_CTX sha; @@ -72,25 +91,25 @@ libdcp::make_digest (string filename, sigc::signal1* progress) if (r == Kumu::RESULT_ENDOFFILE) { break; } else if (ASDCP_FAILURE (r)) { - throw FileError ("could not read file to compute digest", filename); + boost::throw_exception (FileError ("could not read file to compute digest", filename)); } SHA1_Update (&sha, read_buffer.Data(), read); done += read; - - if (progress) { - (*progress) (0.5 + (0.5 * done / file_size)); - } } byte_t byte_buffer[20]; SHA1_Final (byte_buffer, &sha); - stringstream s; char digest[64]; return Kumu::base64encode (byte_buffer, 20, digest, 64); } +/** Convert a content kind to a string which can be used in a + * node. + * @param kind ContentKind. + * @return string. + */ string libdcp::content_kind_to_string (ContentKind kind) { @@ -120,9 +139,16 @@ libdcp::content_kind_to_string (ContentKind kind) assert (false); } +/** Convert a string from a node to a libdcp ContentKind. + * Reasonably tolerant about varying case. + * @param type Content kind string. + * @return libdcp ContentKind. + */ libdcp::ContentKind libdcp::content_kind_from_string (string type) { + /* XXX: should probably just convert type to lower-case and have done with it */ + if (type == "feature") { return FEATURE; } else if (type == "short") { @@ -135,7 +161,7 @@ libdcp::content_kind_from_string (string type) return TRANSITIONAL; } else if (type == "rating") { return RATING; - } else if (type == "teaser") { + } else if (type == "teaser" || type == "Teaser") { return TEASER; } else if (type == "policy") { return POLICY; @@ -147,27 +173,16 @@ libdcp::content_kind_from_string (string type) assert (false); } - -bool -libdcp::starts_with (string big, string little) -{ - if (little.size() > big.size()) { - return false; - } - - return big.substr (0, little.length()) == little; -} - -bool -libdcp::ends_with (string big, string little) -{ - if (little.size() > big.size()) { - return false; - } - - return big.compare (big.length() - little.length(), little.length(), little) == 0; -} +/** Decompress a JPEG2000 image to a bitmap. + * @param data JPEG2000 data. + * @param size Size of data in bytes. + * @param reduce A power of 2 by which to reduce the size of the decoded image; + * e.g. 0 reduces by (2^0 == 1), ie keeping the same size. + * 1 reduces by (2^1 == 2), ie halving the size of the image. + * This is useful for scaling 4K DCP images down to 2K. + * @return openjpeg image, which the caller must call opj_image_destroy() on. + */ opj_image_t * libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) { @@ -181,19 +196,37 @@ libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) if (!image) { opj_destroy_decompress (decoder); opj_cio_close (cio); - throw DCPReadError ("could not decode JPEG2000 codestream"); + boost::throw_exception (DCPReadError ("could not decode JPEG2000 codestream of " + lexical_cast (size) + " bytes.")); } opj_cio_close (cio); - image->x1 /= pow (2, reduce); - image->y1 /= pow (2, reduce); + image->x1 = rint (float(image->x1) / pow (2, reduce)); + image->y1 = rint (float(image->y1) / pow (2, reduce)); return image; } +/** Convert an openjpeg XYZ image to RGB. + * @param xyz_frame Frame in XYZ. + * @return RGB image. + */ shared_ptr -libdcp::xyz_to_rgb (opj_image_t* xyz_frame) +libdcp::xyz_to_rgb (opj_image_t* xyz_frame, shared_ptr lut_in, shared_ptr lut_out) { + float const dci_coefficient = 48.0 / 52.37; + + /* sRGB color matrix for XYZ -> RGB. This is the same as the one used by the Fraunhofer + EasyDCP player, I think. + */ + + float const colour_matrix[3][3] = { + { 3.24096989631653, -1.5373831987381, -0.498610764741898 }, + { -0.96924364566803, 1.87596750259399, 0.0415550582110882 }, + { 0.0556300804018974, -0.203976958990097, 1.05697154998779 } + }; + + int const max_colour = pow (2, lut_out->bit_depth()) - 1; + struct { double x, y, z; } s; @@ -206,7 +239,7 @@ libdcp::xyz_to_rgb (opj_image_t* xyz_frame) int* xyz_y = xyz_frame->comps[1].data; int* xyz_z = xyz_frame->comps[2].data; - shared_ptr argb_frame (new ARGBFrame (xyz_frame->x1, xyz_frame->y1)); + shared_ptr argb_frame (new ARGBFrame (Size (xyz_frame->x1, xyz_frame->y1))); uint8_t* argb = argb_frame->data (); @@ -217,19 +250,19 @@ libdcp::xyz_to_rgb (opj_image_t* xyz_frame) assert (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_x < 4096 && *xyz_z < 4096); /* In gamma LUT */ - s.x = lut_in[*xyz_x++]; - s.y = lut_in[*xyz_y++]; - s.z = lut_in[*xyz_z++]; - + s.x = lut_in->lut()[*xyz_x++]; + s.y = lut_in->lut()[*xyz_y++]; + s.z = lut_in->lut()[*xyz_z++]; + /* DCI companding */ - s.x /= DCI_COEFFICIENT; - s.y /= DCI_COEFFICIENT; - s.z /= DCI_COEFFICIENT; + s.x /= dci_coefficient; + s.y /= dci_coefficient; + s.z /= dci_coefficient; /* XYZ to RGB */ - d.r = ((s.x * color_matrix[0][0]) + (s.y * color_matrix[0][1]) + (s.z * color_matrix[0][2])); - d.g = ((s.x * color_matrix[1][0]) + (s.y * color_matrix[1][1]) + (s.z * color_matrix[1][2])); - d.b = ((s.x * color_matrix[2][0]) + (s.y * color_matrix[2][1]) + (s.z * color_matrix[2][2])); + d.r = ((s.x * colour_matrix[0][0]) + (s.y * colour_matrix[0][1]) + (s.z * colour_matrix[0][2])); + d.g = ((s.x * colour_matrix[1][0]) + (s.y * colour_matrix[1][1]) + (s.z * colour_matrix[1][2])); + d.b = ((s.x * colour_matrix[2][0]) + (s.y * colour_matrix[2][1]) + (s.z * colour_matrix[2][2])); d.r = min (d.r, 1.0); d.r = max (d.r, 0.0); @@ -241,9 +274,9 @@ libdcp::xyz_to_rgb (opj_image_t* xyz_frame) d.b = max (d.b, 0.0); /* Out gamma LUT */ - *argb_line++ = lut_out[(int) (d.b * COLOR_DEPTH)]; - *argb_line++ = lut_out[(int) (d.g * COLOR_DEPTH)]; - *argb_line++ = lut_out[(int) (d.r * COLOR_DEPTH)]; + *argb_line++ = lut_out->lut()[(int) (d.b * max_colour)] * 0xff; + *argb_line++ = lut_out->lut()[(int) (d.g * max_colour)] * 0xff; + *argb_line++ = lut_out->lut()[(int) (d.r * max_colour)] * 0xff; *argb_line++ = 0xff; } @@ -253,6 +286,9 @@ libdcp::xyz_to_rgb (opj_image_t* xyz_frame) return argb_frame; } +/** @param s A string. + * @return true if the string contains only space, newline or tab characters, or is empty. + */ bool libdcp::empty_or_white_space (string s) { @@ -264,3 +300,135 @@ libdcp::empty_or_white_space (string s) return true; } + +void +libdcp::init () +{ + if (xmlSecInit() < 0) { + throw MiscError ("could not initialise xmlsec"); + } +} + +void +libdcp::add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, string const & signer_key, string const & ns) +{ + parent->add_child("SignatureValue", ns); + + xmlpp::Element* key_info = parent->add_child("KeyInfo", ns); + list > c = certificates.leaf_to_root (); + for (list >::iterator i = c.begin(); i != c.end(); ++i) { + xmlpp::Element* data = key_info->add_child("X509Data", ns); + + { + xmlpp::Element* serial = data->add_child("X509IssuerSerial", ns); + serial->add_child("X509IssuerName", ns)->add_child_text((*i)->issuer ()); + serial->add_child("X509SerialNumber", ns)->add_child_text((*i)->serial ()); + } + + data->add_child("X509Certificate", ns)->add_child_text((*i)->certificate()); + } + + xmlSecKeysMngrPtr keys_manager = xmlSecKeysMngrCreate(); + if (!keys_manager) { + throw MiscError ("could not create keys manager"); + } + + xmlSecDSigCtx signature_context; + + if (xmlSecDSigCtxInitialize (&signature_context, keys_manager) < 0) { + throw MiscError ("could not initialise XMLSEC context"); + } + + if (xmlSecDSigCtxSign (&signature_context, parent->cobj()) < 0) { + throw MiscError ("could not sign"); + } + + xmlSecDSigCtxFinalize (&signature_context); + xmlSecKeysMngrDestroy (keys_manager); +} + + +void +libdcp::add_signer (xmlpp::Element* parent, CertificateChain const & certificates, string const & ns) +{ + xmlpp::Element* signer = parent->add_child("Signer"); + + { + xmlpp::Element* data = signer->add_child("X509Data", ns); + + { + xmlpp::Element* serial_element = data->add_child("X509IssuerSerial", ns); + serial_element->add_child("X509IssuerName", ns)->add_child_text (certificates.leaf()->issuer()); + serial_element->add_child("X509SerialNumber", ns)->add_child_text (certificates.leaf()->serial()); + } + + data->add_child("X509SubjectName", ns)->add_child_text (certificates.leaf()->subject()); + } +} + +void +libdcp::sign (xmlpp::Element* parent, CertificateChain const & certificates, string const & signer_key) +{ + add_signer (parent, certificates, "dsig"); + + xmlpp::Element* signature = parent->add_child("Signature", "dsig"); + + { + xmlpp::Element* signed_info = signature->add_child ("SignedInfo", "dsig"); + signed_info->add_child("CanonicalizationMethod", "dsig")->set_attribute ("Algorithm", "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"); + signed_info->add_child("SignatureMethod", "dsig")->set_attribute("Algorithm", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"); + { + xmlpp::Element* reference = signed_info->add_child("Reference", "dsig"); + reference->set_attribute ("URI", ""); + { + xmlpp::Element* transforms = reference->add_child("Transforms", "dsig"); + transforms->add_child("Transform", "dsig")->set_attribute ( + "Algorithm", "http://www.w3.org/2000/09/xmldsig#enveloped-signature" + ); + } + reference->add_child("DigestMethod", "dsig")->set_attribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1"); + /* This will be filled in by the signing later */ + reference->add_child("DigestValue", "dsig"); + } + } + + add_signature_value (signature, certificates, signer_key, "dsig"); +} + +bool libdcp::operator== (libdcp::Size const & a, libdcp::Size const & b) +{ + return (a.width == b.width && a.height == b.height); +} + +bool libdcp::operator!= (libdcp::Size const & a, libdcp::Size const & b) +{ + return !(a == b); +} + +/** The base64 decode routine in KM_util.cpp gives different values to both + * this and the command-line base64 for some inputs. Not sure why. + */ +int +libdcp::base64_decode (string const & in, unsigned char* out, int out_length) +{ + BIO* b64 = BIO_new (BIO_f_base64 ()); + + /* This means the input should have no newlines */ + BIO_set_flags (b64, BIO_FLAGS_BASE64_NO_NL); + + /* Copy our input string, removing newlines */ + char in_buffer[in.size() + 1]; + char* p = in_buffer; + for (size_t i = 0; i < in.size(); ++i) { + if (in[i] != '\n' && in[i] != '\r') { + *p++ = in[i]; + } + } + + BIO* bmem = BIO_new_mem_buf (in_buffer, p - in_buffer); + bmem = BIO_push (b64, bmem); + int const N = BIO_read (bmem, out, out_length); + BIO_free_all (bmem); + + return N; +}