X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=d8c754607f47a5940b51e95921ead82c11a2daca;hb=2bfd531137f1a4874493186015046e33c5a07c1e;hp=5f1d589d669d92f53cbf29d381f06f97fa4438a5;hpb=80b87ba861708eb2366e77c044fb8e52400b2d09;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 5f1d589d6..d8c754607 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,6 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2012-2015 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 @@ -22,56 +21,42 @@ * @brief Some utility functions and classes. */ -#include -#include -#include -#include -#include -#ifdef DCPOMATIC_POSIX -#include -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#ifdef DCPOMATIC_WINDOWS -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -extern "C" { -#include -#include -#include -#include -#include -} #include "util.h" #include "exceptions.h" -#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" +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef DCPOMATIC_WINDOWS -#include "stack.hpp" +#include +#include +#endif +#include +#include +#include +#include +#include +#include +#ifdef DCPOMATIC_POSIX +#include +#include #endif #include "i18n.h" @@ -81,27 +66,25 @@ using std::setfill; using std::ostream; using std::endl; using std::vector; -using std::hex; -using std::setw; -using std::ios; using std::min; using std::max; +using std::map; using std::list; using std::multimap; -using std::map; using std::istream; -using std::numeric_limits; using std::pair; using std::cout; using std::bad_alloc; -using std::streampos; using std::set_terminate; using boost::shared_ptr; using boost::thread; using boost::optional; -using libdcp::Size; -using libdcp::raw_convert; +using dcp::Size; +/** Path to our executable, required by the stacktrace stuff and filled + * in during App::onInit(). + */ +string program_name; static boost::thread::id ui_thread; static boost::filesystem::path backtrace_file; @@ -123,9 +106,9 @@ seconds_to_hms (int s) SafeStringStream hms; hms << h << N_(":"); hms.width (2); - hms << std::setfill ('0') << m << N_(":"); + hms << setfill ('0') << m << N_(":"); hms.width (2); - hms << std::setfill ('0') << s; + hms << setfill ('0') << s; return hms.str (); } @@ -149,14 +132,11 @@ seconds_to_approximate_hms (int s) if (hours) { if (m > 30 && !minutes) { - ap << (h + 1) << N_(" ") << _("hours"); + /// TRANSLATORS: h here is an abbreviation for hours + ap << (h + 1) << _("h"); } else { - ap << h << N_(" "); - if (h == 1) { - ap << _("hour"); - } else { - ap << _("hours"); - } + /// TRANSLATORS: h here is an abbreviation for hours + ap << h << _("h"); } if (minutes | seconds) { @@ -167,14 +147,11 @@ seconds_to_approximate_hms (int s) if (minutes) { /* Minutes */ if (s > 30 && !seconds) { - ap << (m + 1) << N_(" ") << _("minutes"); + /// TRANSLATORS: m here is an abbreviation for minutes + ap << (m + 1) << _("m"); } else { - ap << m << N_(" "); - if (m == 1) { - ap << _("minute"); - } else { - ap << _("minutes"); - } + /// TRANSLATORS: m here is an abbreviation for minutes + ap << m << _("m"); } if (seconds) { @@ -184,132 +161,104 @@ seconds_to_approximate_hms (int s) if (seconds) { /* Seconds */ - ap << s << N_(" "); - if (s == 1) { - ap << _("second"); - } else { - ap << _("seconds"); - } + /// TRANSLATORS: s here is an abbreviation for seconds + ap << s << _("s"); } return ap.str (); } -#ifdef DCPOMATIC_POSIX -/** @param l Mangled C++ identifier. - * @return Demangled version. - */ -static string -demangle (string l) +double +seconds (struct timeval t) { - string::size_type const b = l.find_first_of (N_("(")); - if (b == string::npos) { - return l; - } + return t.tv_sec + (double (t.tv_usec) / 1e6); +} - string::size_type const p = l.find_last_of (N_("+")); - if (p == string::npos) { - return l; - } +#ifdef DCPOMATIC_WINDOWS - if ((p - b) <= 1) { - return l; - } - - string const fn = l.substr (b + 1, p - b - 1); +/** Resolve symbol name and source location given the path to the executable */ +int +addr2line (void const * const addr) +{ + char addr2line_cmd[512] = { 0 }; + sprintf (addr2line_cmd, "addr2line -f -p -e %.256s %p > %s", program_name.c_str(), addr, backtrace_file.string().c_str()); + return system(addr2line_cmd); +} - int status; - try { +/** This is called when C signals occur on Windows (e.g. SIGSEGV) + * (NOT C++ exceptions!). We write a backtrace to backtrace_file by dark means. + * Adapted from code here: http://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c/ + */ +LONG WINAPI +exception_handler(struct _EXCEPTION_POINTERS * info) +{ + FILE* f = fopen_boost (backtrace_file, "w"); + fprintf (f, "C-style exception %d\n", info->ExceptionRecord->ExceptionCode); + fclose(f); + + if (info->ExceptionRecord->ExceptionCode != EXCEPTION_STACK_OVERFLOW) { + CONTEXT* context = info->ContextRecord; + SymInitialize (GetCurrentProcess (), 0, true); - char* realname = abi::__cxa_demangle (fn.c_str(), 0, 0, &status); - string d (realname); - free (realname); - return d; + STACKFRAME frame = { 0 }; - } catch (std::exception) { + /* setup initial stack frame */ +#if _WIN64 + frame.AddrPC.Offset = context->Rip; + frame.AddrStack.Offset = context->Rsp; + frame.AddrFrame.Offset = context->Rbp; +#else + frame.AddrPC.Offset = context->Eip; + frame.AddrStack.Offset = context->Esp; + frame.AddrFrame.Offset = context->Ebp; +#endif + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrStack.Mode = AddrModeFlat; + frame.AddrFrame.Mode = AddrModeFlat; + while ( + StackWalk ( + IMAGE_FILE_MACHINE_I386, + GetCurrentProcess (), + GetCurrentThread (), + &frame, + context, + 0, + SymFunctionTableAccess, + SymGetModuleBase, + 0 + ) + ) { + addr2line((void *) frame.AddrPC.Offset); + } + } else { +#ifdef _WIN64 + addr2line ((void *) info->ContextRecord->Rip); +#else + addr2line ((void *) info->ContextRecord->Eip); +#endif } - return l; + return EXCEPTION_CONTINUE_SEARCH; } +#endif -/** Write a stacktrace to an ostream. - * @param out Stream to write to. - * @param levels Number of levels to go up the call stack. - */ void -stacktrace (ostream& out, int levels) +set_backtrace_file (boost::filesystem::path p) { - void *array[200]; - size_t size = backtrace (array, 200); - char** strings = backtrace_symbols (array, size); - - if (strings) { - for (size_t i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) { - out << N_(" ") << demangle (strings[i]) << "\n"; - } - - free (strings); - } + backtrace_file = p; } -#endif -/** @param v Version as used by FFmpeg. - * @return A string representation of v. +/** This is called when there is an unhandled exception. Any + * backtrace in this function is useless on Windows as the stack has + * already been unwound from the throw; we have the gdb wrap hack to + * cope with that. */ -static string -ffmpeg_version_to_string (int v) -{ - SafeStringStream s; - s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff); - return s.str (); -} - -/** Return a user-readable string summarising the versions of our dependencies */ -string -dependency_version_summary () -{ - 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_(", ") - << N_("libavformat ") << ffmpeg_version_to_string (avformat_version()) << N_(", ") - << N_("libavutil ") << ffmpeg_version_to_string (avutil_version()) << N_(", ") - << N_("libswscale ") << ffmpeg_version_to_string (swscale_version()) << N_(", ") - << MagickVersion << N_(", ") - << N_("libssh ") << ssh_version (0) << N_(", ") - << N_("libdcp ") << libdcp::version << N_(" git ") << libdcp::git_commit; - - return s.str (); -} - -double -seconds (struct timeval t) -{ - return t.tv_sec + (double (t.tv_usec) / 1e6); -} - -#ifdef DCPOMATIC_WINDOWS -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\n", i->instruction, i->function.c_str(), i->line, i->module.c_str()); - } - fclose (f); - return EXCEPTION_CONTINUE_SEARCH; -} -#endif - -/* From http://stackoverflow.com/questions/2443135/how-do-i-find-where-an-exception-was-thrown-in-c */ void terminate () { - static bool tried_throw = false; - try { + static bool tried_throw = false; // try once to re-throw currently active exception if (!tried_throw) { tried_throw = true; @@ -325,9 +274,6 @@ terminate () << std::endl; } -#ifdef DCPOMATIC_POSIX - stacktrace (cout, 50); -#endif abort(); } @@ -338,8 +284,9 @@ void dcpomatic_setup () { #ifdef DCPOMATIC_WINDOWS - backtrace_file /= g_get_user_config_dir (); - backtrace_file /= "backtrace.txt"; + boost::filesystem::path p = g_get_user_config_dir (); + p /= "backtrace.txt"; + set_backtrace_file (p); SetUnhandledExceptionFilter(exception_handler); /* Dark voodoo which, I think, gets boost::filesystem::path to @@ -371,14 +318,15 @@ dcpomatic_setup () set_terminate (terminate); - libdcp::init (); + Pango::init (); + dcp::init (); Ratio::setup_ratios (); VideoContentScale::setup_scales (); 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 (); } @@ -401,7 +349,7 @@ mo_path () boost::filesystem::path mo_path () { - return "DCP-o-matic.app/Contents/Resources"; + return "DCP-o-matic 2.app/Contents/Resources"; } #endif @@ -433,70 +381,57 @@ dcpomatic_setup_gettext_i18n (string lang) #endif #ifdef DCPOMATIC_LINUX - bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX); + bindtextdomain ("libdcpomatic", LINUX_LOCALE_PREFIX); #endif } -/** @param s A string. - * @return Parts of the string split at spaces, except when a space is within quotation marks. - */ -vector -split_at_spaces_considering_quotes (string s) -{ - vector out; - bool in_quotes = false; - string c; - for (string::size_type i = 0; i < s.length(); ++i) { - if (s[i] == ' ' && !in_quotes) { - out.push_back (c); - c = N_(""); - } else if (s[i] == '"') { - in_quotes = !in_quotes; - } else { - c += s[i]; - } - } - - out.push_back (c); - return out; -} - -/** @param job Optional job for which to report progress */ +/** Compute a digest of the first and last `size' bytes of a set of files. */ string -md5_digest (vector files, shared_ptr job) +md5_digest_head_tail (vector files, boost::uintmax_t size) { - boost::uintmax_t const buffer_size = 64 * 1024; - char buffer[buffer_size]; - + boost::scoped_array buffer (new char[size]); MD5Digester digester; - vector sizes; - for (size_t i = 0; i < files.size(); ++i) { - sizes.push_back (boost::filesystem::file_size (files[i])); - } - - for (size_t i = 0; i < files.size(); ++i) { + /* Head */ + boost::uintmax_t to_do = size; + char* p = buffer.get (); + int i = 0; + while (i < int64_t (files.size()) && to_do > 0) { FILE* f = fopen_boost (files[i], "rb"); if (!f) { throw OpenFileError (files[i].string()); } - boost::uintmax_t const bytes = boost::filesystem::file_size (files[i]); - boost::uintmax_t remaining = bytes; + boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + fread (p, 1, this_time, f); + p += this_time; + to_do -= this_time; + fclose (f); - while (remaining > 0) { - int const t = min (remaining, buffer_size); - fread (buffer, 1, t, f); - digester.add (buffer, t); - remaining -= t; + ++i; + } + digester.add (buffer.get(), size - to_do); - if (job) { - job->set_progress ((float (i) + 1 - float(remaining) / bytes) / files.size ()); - } + /* Tail */ + to_do = size; + p = buffer.get (); + i = files.size() - 1; + while (i >= 0 && to_do > 0) { + FILE* f = fopen_boost (files[i], "rb"); + if (!f) { + throw OpenFileError (files[i].string()); } + boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + dcpomatic_fseek (f, -this_time, SEEK_END); + fread (p, 1, this_time, f); + p += this_time; + to_do -= this_time; fclose (f); - } + + --i; + } + digester.add (buffer.get(), size - to_do); return digester.get (); } @@ -514,135 +449,6 @@ dcp_audio_frame_rate (int fs) return 96000; } -Socket::Socket (int timeout) - : _deadline (_io_service) - , _socket (_io_service) - , _acceptor (0) - , _timeout (timeout) -{ - _deadline.expires_at (boost::posix_time::pos_infin); - check (); -} - -Socket::~Socket () -{ - delete _acceptor; -} - -void -Socket::check () -{ - if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) { - if (_acceptor) { - _acceptor->cancel (); - } else { - _socket.close (); - } - _deadline.expires_at (boost::posix_time::pos_infin); - } - - _deadline.async_wait (boost::bind (&Socket::check, this)); -} - -/** Blocking connect. - * @param endpoint End-point to connect to. - */ -void -Socket::connect (boost::asio::ip::tcp::endpoint endpoint) -{ - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); - boost::system::error_code ec = boost::asio::error::would_block; - _socket.async_connect (endpoint, boost::lambda::var(ec) = boost::lambda::_1); - do { - _io_service.run_one(); - } while (ec == boost::asio::error::would_block); - - if (ec) { - throw NetworkError (String::compose (_("error during async_connect (%1)"), ec.value ())); - } - - if (!_socket.is_open ()) { - throw NetworkError (_("connect timed out")); - } -} - -void -Socket::accept (int port) -{ - _acceptor = new boost::asio::ip::tcp::acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)); - - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); - boost::system::error_code ec = boost::asio::error::would_block; - _acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1); - do { - _io_service.run_one (); - } while (ec == boost::asio::error::would_block ); - - delete _acceptor; - _acceptor = 0; - - if (ec) { - throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ())); - } -} - -/** Blocking write. - * @param data Buffer to write. - * @param size Number of bytes to write. - */ -void -Socket::write (uint8_t const * data, int size) -{ - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); - boost::system::error_code ec = boost::asio::error::would_block; - - boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1); - - do { - _io_service.run_one (); - } while (ec == boost::asio::error::would_block); - - if (ec) { - throw NetworkError (String::compose (_("error during async_write (%1)"), ec.value ())); - } -} - -void -Socket::write (uint32_t v) -{ - v = htonl (v); - write (reinterpret_cast (&v), 4); -} - -/** Blocking read. - * @param data Buffer to read to. - * @param size Number of bytes to read. - */ -void -Socket::read (uint8_t* data, int size) -{ - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); - boost::system::error_code ec = boost::asio::error::would_block; - - boost::asio::async_read (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1); - - do { - _io_service.run_one (); - } while (ec == boost::asio::error::would_block); - - if (ec) { - throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ())); - } -} - -uint32_t -Socket::read_uint32 () -{ - uint32_t v; - read (reinterpret_cast (&v), 4); - return ntohl (v); -} - /** Round a number up to the nearest multiple of another number. * @param c Index. * @param s Array of numbers to round, indexed by c. @@ -656,130 +462,32 @@ stride_round_up (int c, int const * stride, int t) return a - (a % t); } -/** 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 - * with # are ignored. - * @param s Stream to read. - * @return key/value pairs. +/** @param n A number. + * @param r Rounding `boundary' (must be a power of 2) + * @return n rounded to the nearest r */ -multimap -read_key_value (istream &s) -{ - multimap kv; - - string line; - while (getline (s, line)) { - if (line.empty ()) { - continue; - } - - if (line[0] == '#') { - continue; - } - - if (line[line.size() - 1] == '\r') { - line = line.substr (0, line.size() - 1); - } - - size_t const s = line.find (' '); - if (s == string::npos) { - continue; - } - - kv.insert (make_pair (line.substr (0, s), line.substr (s + 1))); - } - - return kv; -} - -string -get_required_string (multimap const & kv, string k) -{ - if (kv.count (k) > 1) { - throw StringError (N_("unexpected multiple keys in key-value set")); - } - - multimap::const_iterator i = kv.find (k); - - if (i == kv.end ()) { - throw StringError (String::compose (_("missing key %1 in key-value set"), k)); - } - - return i->second; -} - int -get_required_int (multimap const & kv, string k) +round_to (float n, int r) { - string const v = get_required_string (kv, k); - return raw_convert (v); -} - -float -get_required_float (multimap const & kv, string k) -{ - string const v = get_required_string (kv, k); - return raw_convert (v); -} - -string -get_optional_string (multimap const & kv, string k) -{ - if (kv.count (k) > 1) { - throw StringError (N_("unexpected multiple keys in key-value set")); - } - - multimap::const_iterator i = kv.find (k); - if (i == kv.end ()) { - return N_(""); - } - - return i->second; -} - -int -get_optional_int (multimap const & kv, string k) -{ - if (kv.count (k) > 1) { - throw StringError (N_("unexpected multiple keys in key-value set")); - } - - multimap::const_iterator i = kv.find (k); - if (i == kv.end ()) { - return 0; - } - - return raw_convert (i->second); + DCPOMATIC_ASSERT (r == 1 || r == 2 || r == 4); + return int (n + float(r) / 2) &~ (r - 1); } /** Trip an assert if the caller is not in the UI thread */ void ensure_ui_thread () { - assert (boost::this_thread::get_id() == ui_thread); -} - -/** @param v Content video frame. - * @param audio_sample_rate Source audio sample rate. - * @param frames_per_second Number of video frames per second. - * @return Equivalent number of audio frames for `v'. - */ -int64_t -video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second) -{ - return ((int64_t) v * audio_sample_rate / frames_per_second); + DCPOMATIC_ASSERT (boost::this_thread::get_id() == ui_thread); } string audio_channel_name (int c) { - assert (MAX_DCP_AUDIO_CHANNELS == 12); + DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 12); - /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency - enhancement channel (sub-woofer). HI is the hearing-impaired audio track and - VI is the visually-impaired audio track (audio describe). - */ + /// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency + /// enhancement channel (sub-woofer). HI is the hearing-impaired audio track and + /// VI is the visually-impaired audio track (audio describe). string const channels[] = { _("Left"), _("Right"), @@ -801,9 +509,25 @@ audio_channel_name (int c) bool valid_image_file (boost::filesystem::path f) { + if (boost::starts_with (f.leaf().string(), "._")) { + return false; + } + string ext = f.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx"); + return ( + ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || + ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" || + ext == ".j2c" || ext == ".j2k" + ); +} + +bool +valid_j2k_file (boost::filesystem::path f) +{ + string ext = f.extension().string(); + transform (ext.begin(), ext.end(), ext.begin(), ::tolower); + return (ext == ".j2k" || ext == ".j2c"); } string @@ -821,57 +545,40 @@ tidy_for_filename (string f) return t; } -shared_ptr -make_signer () +dcp::Size +fit_ratio_within (float ratio, dcp::Size full_frame) { - 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); - libdcp::make_signer_chain (sd, openssl_path ()); - break; - } - - ++i; + if (ratio < full_frame.ratio ()) { + return dcp::Size (rint (full_frame.height * ratio), full_frame.height); } - libdcp::CertificateChain chain; + return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); +} - { - boost::filesystem::path p (sd); - p /= "ca.self-signed.pem"; - chain.add (shared_ptr (new libdcp::Certificate (p))); +void * +wrapped_av_malloc (size_t s) +{ + void* p = av_malloc (s); + if (!p) { + throw bad_alloc (); } + return p; +} - { - boost::filesystem::path p (sd); - p /= "intermediate.signed.pem"; - chain.add (shared_ptr (new libdcp::Certificate (p))); - } +FFmpegSubtitlePeriod +subtitle_period (AVSubtitle const & sub) +{ + ContentTime const packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE); - { - boost::filesystem::path p (sd); - p /= "leaf.signed.pem"; - chain.add (shared_ptr (new libdcp::Certificate (p))); + if (sub.end_display_time == static_cast (-1)) { + /* End time is not known */ + return FFmpegSubtitlePeriod (packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3)); } - - boost::filesystem::path signer_key (sd); - signer_key /= "leaf.key"; - - return shared_ptr (new libdcp::Signer (chain, signer_key)); + + return FFmpegSubtitlePeriod ( + packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), + packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) + ); } map @@ -920,75 +627,46 @@ split_get_request (string url) return r; } -libdcp::Size -fit_ratio_within (float ratio, libdcp::Size full_frame) +long +frame_info_position (int frame, Eyes eyes) { - if (ratio < full_frame.ratio ()) { - return libdcp::Size (rint (full_frame.height * ratio), full_frame.height); - } + static int const info_size = 48; - return libdcp::Size (full_frame.width, rint (full_frame.width / ratio)); -} - -void * -wrapped_av_malloc (size_t s) -{ - void* p = av_malloc (s); - if (!p) { - throw bad_alloc (); - } - return p; -} - -string -entities_to_text (string e) -{ - boost::algorithm::replace_all (e, "%3A", ":"); - boost::algorithm::replace_all (e, "%2F", "/"); - return e; -} - -int64_t -divide_with_round (int64_t a, int64_t b) -{ - if (a % b >= (b / 2)) { - return (a + b - 1) / b; - } else { - return a / b; + switch (eyes) { + case EYES_BOTH: + return frame * info_size; + case EYES_LEFT: + return frame * info_size * 2; + case EYES_RIGHT: + return frame * info_size * 2 + info_size; + default: + DCPOMATIC_ASSERT (false); } -} -ScopedTemporary::ScopedTemporary () - : _open (0) -{ - _file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path (); -} - -ScopedTemporary::~ScopedTemporary () -{ - close (); - boost::system::error_code ec; - boost::filesystem::remove (_file, ec); + DCPOMATIC_ASSERT (false); } -char const * -ScopedTemporary::c_str () const +dcp::FrameInfo +read_frame_info (FILE* file, int frame, Eyes eyes) { - return _file.string().c_str (); -} + dcp::FrameInfo info; + dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); + fread (&info.offset, sizeof (info.offset), 1, file); + fread (&info.size, sizeof (info.size), 1, file); + + char hash_buffer[33]; + fread (hash_buffer, 1, 32, file); + hash_buffer[32] = '\0'; + info.hash = hash_buffer; -FILE* -ScopedTemporary::open (char const * params) -{ - _open = fopen (c_str(), params); - return _open; + return info; } void -ScopedTemporary::close () +write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info) { - if (_open) { - fclose (_open); - _open = 0; - } + dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); + fwrite (&info.offset, sizeof (info.offset), 1, file); + fwrite (&info.size, sizeof (info.size), 1, file); + fwrite (info.hash.c_str(), 1, info.hash.size(), file); }