X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Futil.cc;h=4ac3685c4cd9ab9c5087ce20ac5c45d6cc85d89c;hb=0b3a3e461284b91e774f44c48f6f2f59b2a5832f;hp=6769cc41f86debfbf31555c30c59e068c6e0af9d;hpb=62ee85a258aa9329544d8542dfbcc40ce8177a7a;p=libdcp.git diff --git a/src/util.cc b/src/util.cc index 6769cc41..4ac3685c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,15 @@ #include #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "KM_util.h" #include "KM_fileio.h" #include "AS_DCP.h" @@ -34,13 +42,21 @@ #include "exceptions.h" #include "types.h" #include "argb_frame.h" -#include "lut.h" +#include "certificates.h" +#include "gamma_lut.h" +#include "xyz_frame.h" using std::string; +using std::wstring; +using std::cout; using std::stringstream; using std::min; using std::max; +using std::list; +using std::setw; +using std::setfill; using boost::shared_ptr; +using boost::lexical_cast; using namespace libdcp; /** Create a UUID. @@ -59,21 +75,27 @@ libdcp::make_uuid () /** Create a digest for a file. * @param filename File name. + * @param progress Pointer to a progress reporting function, or 0. The function will be called + * with a progress value between 0 and 1. * @return Digest. */ string -libdcp::make_digest (string filename) +libdcp::make_digest (string filename, boost::function* progress) { Kumu::FileReader reader; - if (ASDCP_FAILURE (reader.OpenRead (filename.c_str ()))) { - throw FileError ("could not open file to compute digest", filename); + Kumu::Result_t r = reader.OpenRead (filename.c_str ()); + if (ASDCP_FAILURE (r)) { + boost::throw_exception (FileError ("could not open file to compute digest", filename, r)); } SHA_CTX sha; SHA1_Init (&sha); - - Kumu::ByteString read_buffer (65536); - int done = 0; + + int const buffer_size = 65536; + Kumu::ByteString read_buffer (buffer_size); + + Kumu::fsize_t done = 0; + Kumu::fsize_t const size = reader.Size (); while (1) { ui32_t read = 0; Kumu::Result_t r = reader.Read (read_buffer.Data(), read_buffer.Capacity(), &read); @@ -81,19 +103,22 @@ libdcp::make_digest (string filename) 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, r)); } SHA1_Update (&sha, read_buffer.Data(), read); - done += read; + + if (progress) { + (*progress) (float (done) / size); + done += read; + } } - byte_t byte_buffer[20]; + byte_t byte_buffer[SHA_DIGEST_LENGTH]; SHA1_Final (byte_buffer, &sha); - stringstream s; char digest[64]; - return Kumu::base64encode (byte_buffer, 20, digest, 64); + return Kumu::base64encode (byte_buffer, SHA_DIGEST_LENGTH, digest, 64); } /** Convert a content kind to a string which can be used in a @@ -138,13 +163,13 @@ libdcp::content_kind_to_string (ContentKind kind) libdcp::ContentKind libdcp::content_kind_from_string (string type) { - /* XXX: should probably just convert type to lower-case and have done with it */ + transform (type.begin(), type.end(), type.begin(), ::tolower); if (type == "feature") { return FEATURE; } else if (type == "short") { return SHORT; - } else if (type == "trailer" || type == "Trailer") { + } else if (type == "trailer") { return TRAILER; } else if (type == "test") { return TEST; @@ -152,7 +177,7 @@ libdcp::content_kind_from_string (string type) return TRANSITIONAL; } else if (type == "rating") { return RATING; - } else if (type == "teaser" || type == "Teaser") { + } else if (type == "teaser") { return TEASER; } else if (type == "policy") { return POLICY; @@ -172,9 +197,9 @@ libdcp::content_kind_from_string (string type) * 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. + * @return XYZ image. */ -opj_image_t * +shared_ptr libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) { opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K); @@ -187,80 +212,15 @@ 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_destroy_decompress (decoder); opj_cio_close (cio); 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) -{ - struct { - double x, y, z; - } s; - - struct { - double r, g, b; - } d; - - int* xyz_x = xyz_frame->comps[0].data; - 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)); - - uint8_t* argb = argb_frame->data (); - - for (int y = 0; y < xyz_frame->y1; ++y) { - uint8_t* argb_line = argb; - for (int x = 0; x < xyz_frame->x1; ++x) { - - 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++]; - - /* DCI companding */ - 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 = min (d.r, 1.0); - d.r = max (d.r, 0.0); - - d.g = min (d.g, 1.0); - d.g = max (d.g, 0.0); - - d.b = min (d.b, 1.0); - 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++ = 0xff; - } - - argb += argb_frame->stride (); - } - - return argb_frame; + return shared_ptr (new XYZFrame (image)); } /** @param s A string. @@ -277,3 +237,126 @@ libdcp::empty_or_white_space (string s) return true; } + +void +libdcp::init () +{ + if (xmlSecInit() < 0) { + throw MiscError ("could not initialise xmlsec"); + } + +#ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING + if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { + throw MiscError ("unable to load default xmlsec-crypto library"); + } +#endif + + if (xmlSecCryptoAppInit(0) < 0) { + throw MiscError ("could not initialise crypto"); + } + + if (xmlSecCryptoInit() < 0) { + throw MiscError ("could not initialise xmlsec-crypto"); + } +} + +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; +} + +/** @param tm Local time. + * @return String of the form 2014-04-02T18:05:23+04:00, where the UTC offset is derived + * from the current system time zone. + */ +string +libdcp::tm_to_string (struct tm* tm) +{ + char buffer[64]; + strftime (buffer, 64, "%Y-%m-%dT%H:%M:%S", tm); + + /* Compute current UTC offset */ + boost::posix_time::ptime const utc_now = boost::posix_time::second_clock::universal_time (); + boost::posix_time::ptime const now = boost::date_time::c_local_adjustor::utc_to_local (utc_now); + + return string (buffer) + utc_offset_to_string (now - utc_now); +} + +/** @param b Offset from UTC to local time. + * @return string of the form e.g. -01:00. + */ +string +libdcp::utc_offset_to_string (boost::posix_time::time_duration b) +{ + bool const negative = b.is_negative (); + if (negative) { + b = boost::posix_time::time_duration (-b.hours(), b.minutes(), 0, 0); + } + + stringstream o; + if (negative) { + o << "-"; + } else { + o << "+"; + } + + o << setw(2) << setfill('0') << b.hours() << ":" << setw(2) << setfill('0') << b.minutes(); + return o.str (); +} + +string +libdcp::ptime_to_string (boost::posix_time::ptime t) +{ + struct tm t_tm = boost::posix_time::to_tm (t); + return tm_to_string (&t_tm); +} + + +/* Apparently there is no way to create an ofstream using a UTF-8 + filename under Windows. We are hence reduced to using fopen + with this wrapper. +*/ +FILE * +libdcp::fopen_boost (boost::filesystem::path p, string t) +{ +#ifdef LIBDCP_WINDOWS + wstring w (t.begin(), t.end()); + /* c_str() here should give a UTF-16 string */ + return _wfopen (p.c_str(), w.c_str ()); +#else + return fopen (p.c_str(), t.c_str ()); +#endif +}