X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=4a0965858eabbf07aa0c156f5714eeb50d2f7ec7;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=c298a1946be278847e905693e4f9f663eeb13a86;hpb=f213fd833a840fc97e3875979ae7dc7cbbc883b1;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index c298a1946..4a0965858 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -23,7 +24,6 @@ #include "util.h" #include "exceptions.h" -#include "scaler.h" #include "dcp_content_type.h" #include "filter.h" #include "cinema_sound_processor.h" @@ -33,34 +33,25 @@ #include "cross.h" #include "video_content.h" #include "rect.h" -#include "md5_digester.h" +#include "digester.h" #include "audio_processor.h" -#include "safe_stringstream.h" -#include +#include "compose.hpp" +#include #include -#include -#include +#include +#include +#include extern "C" { +#include #include -#include -#include -#include -#include } +#include +#ifdef DCPOMATIC_GRAPHICS_MAGICK +#include +#endif #include -#include #include -#ifdef DCPOMATIC_IMAGE_MAGICK -#include -#else -#include -#include -#endif -#include -#include #include -#include -#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -87,6 +78,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; @@ -97,8 +89,9 @@ using std::set_terminate; using boost::shared_ptr; using boost::thread; using boost::optional; +using boost::lexical_cast; +using boost::bad_lexical_cast; using dcp::Size; -using dcp::raw_convert; /** Path to our executable, required by the stacktrace stuff and filled * in during App::onInit(). @@ -122,7 +115,7 @@ seconds_to_hms (int s) int h = m / 60; m -= (h * 60); - SafeStringStream hms; + locked_stringstream hms; hms << h << N_(":"); hms.width (2); hms << setfill ('0') << m << N_(":"); @@ -143,11 +136,11 @@ seconds_to_approximate_hms (int s) int h = m / 60; m -= (h * 60); - SafeStringStream ap; + locked_stringstream ap; bool const hours = h > 0; - bool const minutes = h < 10 && m > 0; - bool const seconds = m < 10 && s > 0; + bool const minutes = h < 6 && m > 0; + bool const seconds = h == 0 && m < 10 && s > 0; if (hours) { if (m > 30 && !minutes) { @@ -158,7 +151,7 @@ seconds_to_approximate_hms (int s) ap << h << _("h"); } - if (minutes | seconds) { + if (minutes || seconds) { ap << N_(" "); } } @@ -187,17 +180,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) { @@ -211,7 +193,7 @@ 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()); + sprintf (addr2line_cmd, "addr2line -f -p -e %.256s %p > %s", program_name.c_str(), addr, backtrace_file.string().c_str()); return system(addr2line_cmd); } @@ -225,19 +207,19 @@ 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); - + 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 +#else frame.AddrPC.Offset = context->Eip; frame.AddrStack.Offset = context->Esp; frame.AddrFrame.Offset = context->Ebp; @@ -245,7 +227,7 @@ exception_handler(struct _EXCEPTION_POINTERS * info) frame.AddrPC.Mode = AddrModeFlat; frame.AddrStack.Mode = AddrModeFlat; frame.AddrFrame.Mode = AddrModeFlat; - + while ( StackWalk ( IMAGE_FILE_MACHINE_I386, @@ -262,13 +244,13 @@ exception_handler(struct _EXCEPTION_POINTERS * info) addr2line((void *) frame.AddrPC.Offset); } } else { -#ifdef _WIN64 +#ifdef _WIN64 addr2line ((void *) info->ContextRecord->Rip); -#else +#else addr2line ((void *) info->ContextRecord->Eip); -#endif +#endif } - + return EXCEPTION_CONTINUE_SEARCH; } #endif @@ -300,25 +282,17 @@ terminate () << e.what() << std::endl; } catch (...) { - std::cerr << __FUNCTION__ << " caught unknown/unhandled exception." + std::cerr << __FUNCTION__ << " caught unknown/unhandled exception." << std::endl; } abort(); } -/** Call the required functions to set up DCP-o-matic's static arrays, etc. - * Must be called from the UI thread, if there is one. - */ void -dcpomatic_setup () +dcpomatic_setup_path_encoding () { #ifdef DCPOMATIC_WINDOWS - 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 correctly convert UTF-8 strings to paths, and also paths back to UTF-8 strings (on path::string()). @@ -333,8 +307,22 @@ dcpomatic_setup () */ std::locale::global (boost::locale::generator().generate ("")); boost::filesystem::path::imbue (std::locale ()); -#endif - +#endif +} + +/** Call the required functions to set up DCP-o-matic's static arrays, etc. + * Must be called from the UI thread, if there is one. + */ +void +dcpomatic_setup () +{ +#ifdef DCPOMATIC_WINDOWS + boost::filesystem::path p = g_get_user_config_dir (); + p /= "backtrace.txt"; + set_backtrace_file (p); + SetUnhandledExceptionFilter(exception_handler); +#endif + avfilter_register_all (); #ifdef DCPOMATIC_OSX @@ -350,15 +338,21 @@ dcpomatic_setup () Pango::init (); dcp::init (); - + Ratio::setup_ratios (); + PresetColourConversion::setup_colour_conversion_presets (); VideoContentScale::setup_scales (); DCPContentType::setup_dcp_content_types (); - Scaler::setup_scalers (); Filter::setup_filters (); CinemaSoundProcessor::setup_cinema_sound_processors (); AudioProcessor::setup_audio_processors (); + curl_global_init (CURL_GLOBAL_ALL); + +#ifdef DCPOMATIC_GRAPHICS_MAGICK + Magick::InitializeMagick (0); +#endif + ui_thread = boost::this_thread::get_id (); } @@ -404,24 +398,24 @@ dcpomatic_setup_gettext_i18n (string lang) } setlocale (LC_ALL, ""); - textdomain ("libdcpomatic"); + textdomain ("libdcpomatic2"); #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) - bindtextdomain ("libdcpomatic", mo_path().string().c_str()); - bind_textdomain_codeset ("libdcpomatic", "UTF8"); -#endif + bindtextdomain ("libdcpomatic2", mo_path().string().c_str()); + bind_textdomain_codeset ("libdcpomatic2", "UTF8"); +#endif #ifdef DCPOMATIC_LINUX - bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX); + bindtextdomain ("libdcpomatic2", LINUX_LOCALE_PREFIX); #endif } /** Compute a digest of the first and last `size' bytes of a set of files. */ string -md5_digest_head_tail (vector files, boost::uintmax_t size) +digest_head_tail (vector files, boost::uintmax_t size) { boost::scoped_array buffer (new char[size]); - MD5Digester digester; + Digester digester; /* Head */ boost::uintmax_t to_do = size; @@ -454,32 +448,19 @@ md5_digest_head_tail (vector files, boost::uintmax_t si } boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); - fseek (f, -this_time, SEEK_END); + 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 (); } -/** @param An arbitrary audio frame rate. - * @return The appropriate DCP-approved frame rate (48kHz or 96kHz). - */ -int -dcp_audio_frame_rate (int fs) -{ - if (fs <= 48000) { - return 48000; - } - - return 96000; -} - /** Round a number up to the nearest multiple of another number. * @param c Index. * @param s Array of numbers to round, indexed by c. @@ -493,17 +474,6 @@ 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) -{ - 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 () @@ -514,7 +484,7 @@ ensure_ui_thread () string audio_channel_name (int c) { - DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 12); + DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16); /// 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 @@ -532,6 +502,10 @@ audio_channel_name (int c) _("Right centre"), _("Left rear surround"), _("Right rear surround"), + _("D-BOX primary"), + _("D-BOX secondary"), + _("Unused"), + _("Unused") }; return channels[c]; @@ -540,12 +514,16 @@ 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" || - ext == ".j2c" || ext == ".j2k" + ext == ".j2c" || ext == ".j2k" || ext == ".jp2" ); } @@ -554,7 +532,7 @@ 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"); + return (ext == ".j2k" || ext == ".j2c" || ext == ".jp2"); } string @@ -573,13 +551,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 (lrintf (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, lrintf (full_frame.width / ratio)); } void * @@ -591,34 +569,79 @@ wrapped_av_malloc (size_t s) } return p; } - -/** Return a user-readable string summarising the versions of our dependencies */ + +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; +} + string -dependency_version_summary () +video_asset_filename (shared_ptr asset) { - 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 (); + return "j2c_" + asset->id() + ".mxf"; } -ContentTimePeriod -subtitle_period (AVSubtitle const & sub) +string +audio_asset_filename (shared_ptr asset) { - ContentTime const packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE); + return "pcm_" + asset->id() + ".mxf"; +} - ContentTimePeriod period ( - packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), - packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) - ); +float +relaxed_string_to_float (string s) +{ + try { + boost::algorithm::replace_all (s, ",", "."); + return lexical_cast (s); + } catch (bad_lexical_cast) { + boost::algorithm::replace_all (s, ".", ","); + return lexical_cast (s); + } +} - return period; +bool +string_not_empty (string s) +{ + return !s.empty (); }