X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=99d9ba2c4f55654f12e2af866585121b2f6cb92e;hb=83e5567530d0be24490abdda46d196e4279c5030;hp=c0e32b778669ce3b9f810d5d46ac4c188a3e067d;hpb=937b96045830a2326daff83b70b892f2d25244ff;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index c0e32b778..99d9ba2c4 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + 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 @@ -23,7 +23,6 @@ #include "util.h" #include "exceptions.h" -#include "scaler.h" #include "dcp_content_type.h" #include "filter.h" #include "cinema_sound_processor.h" @@ -36,28 +35,10 @@ #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 @@ -87,6 +68,7 @@ using std::endl; using std::vector; using std::min; using std::max; +using std::map; using std::list; using std::multimap; using std::istream; @@ -98,7 +80,6 @@ using boost::shared_ptr; using boost::thread; 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(). @@ -187,17 +168,6 @@ seconds_to_approximate_hms (int s) return ap.str (); } -/** @param v Version as used by FFmpeg. - * @return A string representation of v. - */ -static string -ffmpeg_version_to_string (int v) -{ - SafeStringStream s; - s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff); - return s.str (); -} - double seconds (struct timeval t) { @@ -287,9 +257,8 @@ set_backtrace_file (boost::filesystem::path p) 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; @@ -355,7 +324,6 @@ dcpomatic_setup () Ratio::setup_ratios (); VideoContentScale::setup_scales (); DCPContentType::setup_dcp_content_types (); - Scaler::setup_scalers (); Filter::setup_filters (); CinemaSoundProcessor::setup_cinema_sound_processors (); AudioProcessor::setup_audio_processors (); @@ -413,49 +381,57 @@ dcpomatic_setup_gettext_i18n (string lang) #endif #ifdef DCPOMATIC_LINUX - bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX); + bindtextdomain ("libdcpomatic", LINUX_LOCALE_PREFIX); #endif } -/** @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); - int const r = fread (buffer, 1, t, f); - if (r != t) { - throw ReadFileError (files[i], errno); - } - 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 (); } @@ -473,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. @@ -662,6 +509,10 @@ 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 ( @@ -695,13 +546,13 @@ tidy_for_filename (string f) } dcp::Size -fit_ratio_within (float ratio, dcp::Size full_frame, int round) +fit_ratio_within (float ratio, dcp::Size full_frame) { if (ratio < full_frame.ratio ()) { - return dcp::Size (round_to (full_frame.height * ratio, round), full_frame.height); + return dcp::Size (rint (full_frame.height * ratio), full_frame.height); } - return dcp::Size (full_frame.width, round_to (full_frame.width / ratio, round)); + return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); } void * @@ -713,34 +564,110 @@ wrapped_av_malloc (size_t s) } return p; } - -/** 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 ") << dcp::version << N_(" git ") << dcp::git_commit; - - return s.str (); -} -ContentTimePeriod +FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub) { ContentTime const packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE); - ContentTimePeriod period ( + 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)); + } + + return FFmpegSubtitlePeriod ( packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) ); +} + +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 period; + return r; } + +long +frame_info_position (int frame, Eyes eyes) +{ + static int const info_size = 48; + + 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); + } + + DCPOMATIC_ASSERT (false); +} + +dcp::FrameInfo +read_frame_info (FILE* file, int frame, Eyes eyes) +{ + 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; + + return info; +} + +void +write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info) +{ + 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); +} +