/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- Copyright (C) 2000-2007 Paul Davis
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
* @brief Some utility functions and classes.
*/
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <climits>
-#include <stdexcept>
-#ifdef DCPOMATIC_POSIX
-#include <execinfo.h>
-#include <cxxabi.h>
-#endif
-#include <libssh/libssh.h>
-#include <signal.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#ifdef DCPOMATIC_WINDOWS
-#include <boost/locale.hpp>
-#endif
-#include <glib.h>
-#include <openjpeg.h>
-#include <magick/MagickCore.h>
-#include <magick/version.h>
-#include <libdcp/version.h>
-#include <libdcp/util.h>
-#include <libdcp/signer_chain.h>
-#include <libdcp/signer.h>
-#include <libdcp/raw_convert.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
-#include <libavutil/pixfmt.h>
-}
#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 <dcp/version.h>
+#include <dcp/util.h>
+#include <dcp/signer.h>
+#include <dcp/raw_convert.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavutil/pixfmt.h>
+}
+#include <glib.h>
+#include <openjpeg.h>
+#include <pangomm/init.h>
+#ifdef DCPOMATIC_IMAGE_MAGICK
+#include <magick/MagickCore.h>
+#else
+#include <magick/common.h>
+#include <magick/magick_config.h>
+#endif
+#include <magick/version.h>
+#include <libssh/libssh.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
#ifdef DCPOMATIC_WINDOWS
-#include "stack.hpp"
+#include <boost/locale.hpp>
+#include <dbghelp.h>
+#endif
+#include <signal.h>
+#include <iomanip>
+#include <iostream>
+#include <fstream>
+#include <climits>
+#include <stdexcept>
+#ifdef DCPOMATIC_POSIX
+#include <execinfo.h>
+#include <cxxabi.h>
#endif
#include "i18n.h"
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::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;
+using dcp::raw_convert;
+/** 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;
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 ();
}
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) {
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) {
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)
-{
- string::size_type const b = l.find_first_of (N_("("));
- if (b == string::npos) {
- return l;
- }
-
- string::size_type const p = l.find_last_of (N_("+"));
- if (p == string::npos) {
- return l;
- }
-
- if ((p - b) <= 1) {
- return l;
- }
-
- string const fn = l.substr (b + 1, p - b - 1);
-
- int status;
- try {
-
- char* realname = abi::__cxa_demangle (fn.c_str(), 0, 0, &status);
- string d (realname);
- free (realname);
- return d;
-
- } catch (std::exception) {
-
- }
-
- return l;
-}
-
-/** 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)
-{
- 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);
- }
-}
-#endif
-
/** @param v Version as used by FFmpeg.
* @return A string representation of v.
*/
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)
{
}
#ifdef DCPOMATIC_WINDOWS
-LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
+
+/** 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);
+}
+
+/** 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)
{
- 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());
+ 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);
+
+ STACKFRAME frame = { 0 };
+
+ /* 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
}
- 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 ()
+set_backtrace_file (boost::filesystem::path p)
{
- static bool tried_throw = false;
+ backtrace_file = p;
+}
+/** 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.
+ */
+void
+terminate ()
+{
try {
+ static bool tried_throw = false;
// try once to re-throw currently active exception
if (!tried_throw) {
tried_throw = true;
<< std::endl;
}
-#ifdef DCPOMATIC_POSIX
- stacktrace (cout, 50);
-#endif
abort();
}
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
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 ();
}
}
#endif
+#ifdef DCPOMATIC_OSX
+boost::filesystem::path
+mo_path ()
+{
+ return "DCP-o-matic 2.app/Contents/Resources";
+}
+#endif
+
void
dcpomatic_setup_gettext_i18n (string lang)
{
-#ifdef DCPOMATIC_POSIX
+#ifdef DCPOMATIC_LINUX
lang += ".UTF8";
#endif
if (!lang.empty ()) {
- /* Override our environment language; this is essential on
- Windows.
+ /* Override our environment language. Note that the caller must not
+ free the string passed into putenv().
*/
- char cmd[64];
- snprintf (cmd, sizeof(cmd), "LANGUAGE=%s", lang.c_str ());
- putenv (cmd);
- snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
- putenv (cmd);
- snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
- putenv (cmd);
+ string s = String::compose ("LANGUAGE=%1", lang);
+ putenv (strdup (s.c_str ()));
+ s = String::compose ("LANG=%1", lang);
+ putenv (strdup (s.c_str ()));
+ s = String::compose ("LC_ALL=%1", lang);
+ putenv (strdup (s.c_str ()));
}
setlocale (LC_ALL, "");
textdomain ("libdcpomatic");
-#ifdef DCPOMATIC_WINDOWS
+#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
bindtextdomain ("libdcpomatic", mo_path().string().c_str());
bind_textdomain_codeset ("libdcpomatic", "UTF8");
#endif
-#ifdef DCPOMATIC_POSIX
+#ifdef DCPOMATIC_LINUX
bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX);
#endif
}
-/** @param s A string.
- * @return Parts of the string split at spaces, except when a space is within quotation marks.
- */
-vector<string>
-split_at_spaces_considering_quotes (string s)
-{
- vector<string> 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<boost::filesystem::path> files, shared_ptr<Job> job)
+md5_digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
{
- boost::uintmax_t const buffer_size = 64 * 1024;
- char buffer[buffer_size];
-
+ boost::scoped_array<char> buffer (new char[size]);
MD5Digester digester;
- vector<int64_t> 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]));
+ 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 ();
}
_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
do {
_io_service.run_one ();
- } while (ec == boost::asio::error::would_block );
+ } while (ec == boost::asio::error::would_block);
delete _acceptor;
_acceptor = 0;
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<string, string>
-read_key_value (istream &s)
-{
- multimap<string, string> 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<string, string> const & kv, string k)
-{
- if (kv.count (k) > 1) {
- throw StringError (N_("unexpected multiple keys in key-value set"));
- }
-
- multimap<string, string>::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<string, string> const & kv, string k)
-{
- string const v = get_required_string (kv, k);
- return raw_convert<int> (v);
-}
-
-float
-get_required_float (multimap<string, string> const & kv, string k)
+round_to (float n, int r)
{
- string const v = get_required_string (kv, k);
- return raw_convert<float> (v);
-}
-
-string
-get_optional_string (multimap<string, string> const & kv, string k)
-{
- if (kv.count (k) > 1) {
- throw StringError (N_("unexpected multiple keys in key-value set"));
- }
-
- multimap<string, string>::const_iterator i = kv.find (k);
- if (i == kv.end ()) {
- return N_("");
- }
-
- return i->second;
-}
-
-int
-get_optional_int (multimap<string, string> const & kv, string k)
-{
- if (kv.count (k) > 1) {
- throw StringError (N_("unexpected multiple keys in key-value set"));
- }
-
- multimap<string, string>::const_iterator i = kv.find (k);
- if (i == kv.end ()) {
- return 0;
- }
-
- return raw_convert<int> (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"),
{
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
return t;
}
-shared_ptr<const libdcp::Signer>
-make_signer ()
-{
- boost::filesystem::path const sd = Config::instance()->signer_chain_directory ();
-
- /* Remake the chain if any of it is missing */
-
- list<boost::filesystem::path> 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<boost::filesystem::path>::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;
- }
-
- libdcp::CertificateChain chain;
-
- {
- boost::filesystem::path p (sd);
- p /= "ca.self-signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
- }
-
- {
- boost::filesystem::path p (sd);
- p /= "intermediate.signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
- }
-
- {
- boost::filesystem::path p (sd);
- p /= "leaf.signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
- }
-
- boost::filesystem::path signer_key (sd);
- signer_key /= "leaf.key";
-
- return shared_ptr<const libdcp::Signer> (new libdcp::Signer (chain, signer_key));
-}
-
-map<string, string>
-split_get_request (string url)
-{
- enum {
- AWAITING_QUESTION_MARK,
- KEY,
- VALUE
- } state = AWAITING_QUESTION_MARK;
-
- map<string, string> r;
- string k;
- string v;
- for (size_t i = 0; i < url.length(); ++i) {
- switch (state) {
- case AWAITING_QUESTION_MARK:
- if (url[i] == '?') {
- state = KEY;
- }
- break;
- case KEY:
- if (url[i] == '=') {
- v.clear ();
- state = VALUE;
- } else {
- k += url[i];
- }
- break;
- case VALUE:
- if (url[i] == '&') {
- r.insert (make_pair (k, v));
- k.clear ();
- state = KEY;
- } else {
- v += url[i];
- }
- break;
- }
- }
-
- if (state == VALUE) {
- r.insert (make_pair (k, v));
- }
-
- return r;
-}
-
-libdcp::Size
-fit_ratio_within (float ratio, libdcp::Size full_frame)
+dcp::Size
+fit_ratio_within (float ratio, dcp::Size full_frame, int round)
{
if (ratio < full_frame.ratio ()) {
- return libdcp::Size (rint (full_frame.height * ratio), full_frame.height);
+ return dcp::Size (round_to (full_frame.height * ratio, round), full_frame.height);
}
- return libdcp::Size (full_frame.width, rint (full_frame.width / ratio));
+ return dcp::Size (full_frame.width, round_to (full_frame.width / ratio, round));
}
void *
return p;
}
+/** Return a user-readable string summarising the versions of our dependencies */
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;
- }
-}
-
-ScopedTemporary::ScopedTemporary ()
- : _open (0)
+dependency_version_summary ()
{
- _file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path ();
-}
+ 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 ") << dcp::version << N_(" git ") << dcp::git_commit;
-ScopedTemporary::~ScopedTemporary ()
-{
- close ();
- boost::system::error_code ec;
- boost::filesystem::remove (_file, ec);
+ return s.str ();
}
-char const *
-ScopedTemporary::c_str () const
+ContentTimePeriod
+subtitle_period (AVSubtitle const & sub)
{
- return _file.string().c_str ();
-}
+ ContentTime const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
-FILE*
-ScopedTemporary::open (char const * params)
-{
- _open = fopen (c_str(), params);
- return _open;
-}
+ ContentTimePeriod period (
+ packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3),
+ packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3)
+ );
-void
-ScopedTemporary::close ()
-{
- if (_open) {
- fclose (_open);
- _open = 0;
- }
+ return period;
}
projects / dcpomatic.git / blobdiff