X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=c9685aa44ff3ee811e1f7e77e052b8047ca8ff1d;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=0eb14845d7da6dba601412a34c72544cd590db4b;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 0eb14845d..c9685aa44 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -22,7 +22,6 @@ * @brief Some utility functions and classes. */ -#include #include #include #include @@ -37,7 +36,6 @@ #include #include #include -#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -45,14 +43,13 @@ #endif #include #include -#include #include #include #include #include #include -#include #include +#include extern "C" { #include #include @@ -65,13 +62,16 @@ extern "C" { #include "scaler.h" #include "dcp_content_type.h" #include "filter.h" -#include "sound_processor.h" +#include "cinema_sound_processor.h" #include "config.h" #include "ratio.h" #include "job.h" #include "cross.h" #include "video_content.h" #include "rect.h" +#include "md5_digester.h" +#include "audio_processor.h" +#include "safe_stringstream.h" #ifdef DCPOMATIC_WINDOWS #include "stack.hpp" #endif @@ -79,7 +79,6 @@ extern "C" { #include "i18n.h" using std::string; -using std::stringstream; using std::setfill; using std::ostream; using std::endl; @@ -101,9 +100,9 @@ using std::streampos; using std::set_terminate; using boost::shared_ptr; using boost::thread; -using boost::lexical_cast; using boost::optional; using dcp::Size; +using dcp::raw_convert; static boost::thread::id ui_thread; static boost::filesystem::path backtrace_file; @@ -123,7 +122,7 @@ seconds_to_hms (int s) int h = m / 60; m -= (h * 60); - stringstream hms; + SafeStringStream hms; hms << h << N_(":"); hms.width (2); hms << std::setfill ('0') << m << N_(":"); @@ -144,26 +143,55 @@ seconds_to_approximate_hms (int s) int h = m / 60; m -= (h * 60); - stringstream ap; - - if (h > 0) { - if (m > 30) { + SafeStringStream ap; + + bool const hours = h > 0; + bool const minutes = h < 10 && m > 0; + bool const seconds = m < 10 && s > 0; + + if (hours) { + if (m > 30 && !minutes) { ap << (h + 1) << N_(" ") << _("hours"); } else { + ap << h << N_(" "); if (h == 1) { - ap << N_("1 ") << _("hour"); + ap << _("hour"); } else { - ap << h << N_(" ") << _("hours"); + ap << _("hours"); } } - } else if (m > 0) { - if (m == 1) { - ap << N_("1 ") << _("minute"); + + if (minutes | seconds) { + ap << N_(" "); + } + } + + if (minutes) { + /* Minutes */ + if (s > 30 && !seconds) { + ap << (m + 1) << N_(" ") << _("minutes"); } else { - ap << m << N_(" ") << _("minutes"); + ap << m << N_(" "); + if (m == 1) { + ap << _("minute"); + } else { + ap << _("minutes"); + } + } + + if (seconds) { + ap << N_(" "); + } + } + + if (seconds) { + /* Seconds */ + ap << s << N_(" "); + if (s == 1) { + ap << _("second"); + } else { + ap << _("seconds"); } - } else { - ap << s << N_(" ") << _("seconds"); } return ap.str (); @@ -234,7 +262,7 @@ stacktrace (ostream& out, int levels) static string ffmpeg_version_to_string (int v) { - stringstream s; + SafeStringStream s; s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff); return s.str (); } @@ -250,8 +278,9 @@ LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *) { dbg::stack s; FILE* f = fopen_boost (backtrace_file, "w"); + fprintf (f, "Exception thrown:"); for (dbg::stack::const_iterator i = s.begin(); i != s.end(); ++i) { - fprintf (f, "%p %s %d %s", i->instruction, i->function.c_str(), i->line, i->module.c_str()); + fprintf (f, "%p %s %d %s\n", i->instruction, i->function.c_str(), i->line, i->module.c_str()); } fclose (f); return EXCEPTION_CONTINUE_SEARCH; @@ -266,7 +295,8 @@ terminate () try { // try once to re-throw currently active exception - if (!tried_throw++) { + if (!tried_throw) { + tried_throw = true; throw; } } @@ -333,7 +363,8 @@ dcpomatic_setup () DCPContentType::setup_dcp_content_types (); Scaler::setup_scalers (); Filter::setup_filters (); - SoundProcessor::setup_sound_processors (); + CinemaSoundProcessor::setup_cinema_sound_processors (); + AudioProcessor::setup_audio_processors (); ui_thread = boost::this_thread::get_id (); } @@ -409,23 +440,6 @@ split_at_spaces_considering_quotes (string s) return out; } -string -md5_digest (void const * data, int size) -{ - MD5_CTX md5_context; - MD5_Init (&md5_context); - MD5_Update (&md5_context, data, size); - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &md5_context); - - stringstream s; - for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { - s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); - } - - return s.str (); -} - /** @param job Optional job for which to report progress */ string md5_digest (vector files, shared_ptr job) @@ -433,8 +447,7 @@ md5_digest (vector files, shared_ptr job) boost::uintmax_t const buffer_size = 64 * 1024; char buffer[buffer_size]; - MD5_CTX md5_context; - MD5_Init (&md5_context); + MD5Digester digester; vector sizes; for (size_t i = 0; i < files.size(); ++i) { @@ -453,7 +466,7 @@ md5_digest (vector files, shared_ptr job) while (remaining > 0) { int const t = min (remaining, buffer_size); fread (buffer, 1, t, f); - MD5_Update (&md5_context, buffer, t); + digester.add (buffer, t); remaining -= t; if (job) { @@ -464,15 +477,7 @@ md5_digest (vector files, shared_ptr job) fclose (f); } - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &md5_context); - - stringstream s; - for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { - s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); - } - - return s.str (); + return digester.get (); } /** @param An arbitrary audio frame rate. @@ -630,6 +635,17 @@ stride_round_up (int c, int const * stride, int t) return a - (a % t); } +/** @param n A number. + * @param r Rounding `boundary' (must be a power of 2) + * @return n rounded to the nearest r + */ +int +round_to (float n, int r) +{ + assert (r == 1 || r == 2 || r == 4); + return int (n + float(r) / 2) &~ (r - 1); +} + /** Read a sequence of key / value pairs from a text stream; * the keys are the first words on the line, and the values are * the remainder of the line following the key. Lines beginning @@ -687,14 +703,14 @@ int get_required_int (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } float get_required_float (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } string @@ -724,7 +740,7 @@ get_optional_int (multimap const & kv, string k) return 0; } - return lexical_cast (i->second); + return raw_convert (i->second); } /** Trip an assert if the caller is not in the UI thread */ @@ -761,25 +777,6 @@ audio_channel_name (int c) return channels[c]; } -LocaleGuard::LocaleGuard () - : _old (0) -{ - char const * old = setlocale (LC_NUMERIC, 0); - - if (old) { - _old = strdup (old); - if (strcmp (_old, "C")) { - setlocale (LC_NUMERIC, "C"); - } - } -} - -LocaleGuard::~LocaleGuard () -{ - setlocale (LC_NUMERIC, _old); - free (_old); -} - bool valid_image_file (boost::filesystem::path f) { @@ -803,59 +800,6 @@ tidy_for_filename (string f) return t; } -shared_ptr -make_signer () -{ - boost::filesystem::path const sd = Config::instance()->signer_chain_directory (); - - /* Remake the chain if any of it is missing */ - - list files; - files.push_back ("ca.self-signed.pem"); - files.push_back ("intermediate.signed.pem"); - files.push_back ("leaf.signed.pem"); - files.push_back ("leaf.key"); - - list::const_iterator i = files.begin(); - while (i != files.end()) { - boost::filesystem::path p (sd); - p /= *i; - if (!boost::filesystem::exists (p)) { - boost::filesystem::remove_all (sd); - boost::filesystem::create_directories (sd); - dcp::make_signer_chain (sd, openssl_path ()); - break; - } - - ++i; - } - - dcp::CertificateChain chain; - - { - boost::filesystem::path p (sd); - p /= "ca.self-signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - { - boost::filesystem::path p (sd); - p /= "intermediate.signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - { - boost::filesystem::path p (sd); - p /= "leaf.signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - boost::filesystem::path signer_key (sd); - signer_key /= "leaf.key"; - - return shared_ptr (new dcp::Signer (chain, signer_key)); -} - map split_get_request (string url) { @@ -903,13 +847,13 @@ split_get_request (string url) } dcp::Size -fit_ratio_within (float ratio, dcp::Size full_frame) +fit_ratio_within (float ratio, dcp::Size full_frame, int round) { if (ratio < full_frame.ratio ()) { - return dcp::Size (rint (full_frame.height * ratio), full_frame.height); + return dcp::Size (round_to (full_frame.height * ratio, round), full_frame.height); } - return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); + return dcp::Size (full_frame.width, round_to (full_frame.width / ratio, round)); } void * @@ -944,7 +888,7 @@ divide_with_round (int64_t a, int64_t b) string dependency_version_summary () { - stringstream s; + SafeStringStream s; s << N_("libopenjpeg ") << opj_version () << N_(", ") << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ") << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ") @@ -1001,3 +945,16 @@ ScopedTemporary::close () _open = 0; } } + +ContentTimePeriod +subtitle_period (AVSubtitle const & sub) +{ + ContentTime const packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE); + + ContentTimePeriod period ( + packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), + packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) + ); + + return period; +}