X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=0a6f381db8adf23cd7c8028e3dd2cc624f49d575;hb=59e769023c392c332331567a1aea94660002c463;hp=c23deb59e2f46ddb9f2021442e9e7b4d4df264de;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index c23deb59e..0a6f381db 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 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,89 +21,89 @@ * @brief Some utility functions and classes. */ -#include -#include -#include -#include -#include -#include -#ifdef DCPOMATIC_POSIX -#include -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef DCPOMATIC_WINDOWS -#include -#endif -#include -#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 +extern "C" { +#include +#include +#include +#include +#include +} +#include +#include +#include +#ifdef DCPOMATIC_IMAGE_MAGICK +#include +#else +#include +#include +#endif +#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" using std::string; -using std::stringstream; 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::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::lexical_cast; using boost::optional; 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; @@ -123,12 +122,12 @@ 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_(":"); + hms << setfill ('0') << m << N_(":"); hms.width (2); - hms << std::setfill ('0') << s; + hms << setfill ('0') << s; return hms.str (); } @@ -144,89 +143,49 @@ seconds_to_approximate_hms (int s) int h = m / 60; m -= (h * 60); - stringstream ap; - - if (h > 0) { - if (m > 30) { - ap << (h + 1) << N_(" ") << _("hours"); - } else { - if (h == 1) { - ap << N_("1 ") << _("hour"); - } else { - ap << h << N_(" ") << _("hours"); - } - } - } else if (m > 0) { - if (m == 1) { - ap << N_("1 ") << _("minute"); + 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) { + /// TRANSLATORS: h here is an abbreviation for hours + ap << (h + 1) << _("h"); } else { - ap << m << N_(" ") << _("minutes"); + /// TRANSLATORS: h here is an abbreviation for hours + ap << h << _("h"); } - } else { - ap << s << N_(" ") << _("seconds"); - } - 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; + if (minutes | seconds) { + ap << N_(" "); + } } - string::size_type const p = l.find_last_of (N_("+")); - if (p == string::npos) { - return l; - } + if (minutes) { + /* Minutes */ + if (s > 30 && !seconds) { + /// TRANSLATORS: m here is an abbreviation for minutes + ap << (m + 1) << _("m"); + } else { + /// TRANSLATORS: m here is an abbreviation for minutes + ap << m << _("m"); + } - if ((p - b) <= 1) { - return l; + if (seconds) { + ap << N_(" "); + } } - - 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) { - + if (seconds) { + /* Seconds */ + /// TRANSLATORS: s here is an abbreviation for seconds + ap << s << _("s"); } - - 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); - } + return ap.str (); } -#endif /** @param v Version as used by FFmpeg. * @return A string representation of v. @@ -234,7 +193,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 (); } @@ -246,19 +205,85 @@ 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"); - 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, "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 +set_backtrace_file (boost::filesystem::path p) +{ + 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 () { @@ -266,7 +291,8 @@ terminate () try { // try once to re-throw currently active exception - if (!tried_throw++) { + if (!tried_throw) { + tried_throw = true; throw; } } @@ -279,9 +305,6 @@ terminate () << std::endl; } -#ifdef DCPOMATIC_POSIX - stacktrace (cout, 50); -#endif abort(); } @@ -292,8 +315,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 @@ -333,7 +357,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 (); } @@ -352,127 +377,95 @@ mo_path () } #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 -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; -} - +/** Compute a digest of the first and last `size' bytes of a set of files. */ string -md5_digest (void const * data, int size) +md5_digest_head_tail (vector files, boost::uintmax_t 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]); - } + boost::scoped_array buffer (new char[size]); + MD5Digester digester; - return s.str (); -} - -/** @param job Optional job for which to report progress */ -string -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); - - 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); - MD5_Update (&md5_context, 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); - } - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &md5_context); + --i; + } + digester.add (buffer.get(), size - to_do); - 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. @@ -550,7 +543,7 @@ Socket::accept (int port) _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; @@ -630,119 +623,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) -{ - string const v = get_required_string (kv, k); - return lexical_cast (v); -} - -float -get_required_float (multimap const & kv, string k) -{ - string const v = get_required_string (kv, k); - return lexical_cast (v); -} - -string -get_optional_string (multimap const & kv, string k) +round_to (float n, int r) { - 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 lexical_cast (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); + DCPOMATIC_ASSERT (boost::this_thread::get_id() == ui_thread); } string audio_channel_name (int c) { - assert (MAX_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"), @@ -761,31 +667,24 @@ 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 () +bool +valid_image_file (boost::filesystem::path f) { - setlocale (LC_NUMERIC, _old); - free (_old); + 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" || + ext == ".j2c" || ext == ".j2k" + ); } bool -valid_image_file (boost::filesystem::path f) +valid_j2k_file (boost::filesystem::path f) { 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 == ".j2k" || ext == ".j2c"); } string @@ -803,113 +702,14 @@ 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) -{ - enum { - AWAITING_QUESTION_MARK, - KEY, - VALUE - } state = AWAITING_QUESTION_MARK; - - map 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; -} - 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 * @@ -922,29 +722,11 @@ wrapped_av_malloc (size_t s) 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; - } -} - /** Return a user-readable string summarising the versions of our dependencies */ 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_(", ") @@ -958,37 +740,15 @@ dependency_version_summary () return s.str (); } -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); -} - -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 (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; }