X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=09f32dfda5d4b541fe5c4874a041fc47aeb6f3bf;hb=fe9d2a290682021cd12a00bf21fa4db3012e2049;hp=b662f8679f42b1921c97f02dfe894ade2c334a3e;hpb=f07623551706b849190c84059bac455088f8eb1e;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index b662f8679..09f32dfda 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 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 . */ @@ -32,19 +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 "compose.hpp" +#include #include -#include #include #include #include +extern "C" { +#include +#include +} +#include +#ifdef DCPOMATIC_GRAPHICS_MAGICK +#include +#endif #include #include #include -#include -#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -82,6 +89,8 @@ 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; /** Path to our executable, required by the stacktrace stuff and filled @@ -106,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_(":"); @@ -127,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) { @@ -142,7 +151,7 @@ seconds_to_approximate_hms (int s) ap << h << _("h"); } - if (minutes | seconds) { + if (minutes || seconds) { ap << N_(" "); } } @@ -184,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); } @@ -198,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; @@ -218,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, @@ -235,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 @@ -273,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()). @@ -306,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 @@ -323,7 +338,7 @@ dcpomatic_setup () Pango::init (); dcp::init (); - + Ratio::setup_ratios (); PresetColourConversion::setup_colour_conversion_presets (); VideoContentScale::setup_scales (); @@ -332,6 +347,12 @@ dcpomatic_setup () 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 (); } @@ -377,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", LINUX_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; @@ -434,25 +455,12 @@ md5_digest_head_tail (vector files, boost::uintmax_t si 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. @@ -466,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 () @@ -487,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 @@ -505,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]; @@ -516,13 +517,13 @@ 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" ); } @@ -531,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 @@ -553,10 +554,10 @@ dcp::Size fit_ratio_within (float ratio, dcp::Size full_frame) { if (ratio < full_frame.ratio ()) { - return dcp::Size (rint (full_frame.height * ratio), full_frame.height); + return dcp::Size (lrintf (full_frame.height * ratio), full_frame.height); } - - return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); + + return dcp::Size (full_frame.width, lrintf (full_frame.width / ratio)); } void * @@ -569,22 +570,6 @@ wrapped_av_malloc (size_t s) return p; } -FFmpegSubtitlePeriod -subtitle_period (AVSubtitle const & sub) -{ - ContentTime const packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE); - - 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) { @@ -593,7 +578,7 @@ split_get_request (string url) KEY, VALUE } state = AWAITING_QUESTION_MARK; - + map r; string k; string v; @@ -631,64 +616,38 @@ split_get_request (string url) 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); -} - string video_asset_filename (shared_ptr asset) { - return "j2c_" + asset->id() + ".mxf"; + dcp::NameFormat::Map values; + values["type"] = "j2c"; + values["id"] = asset->id(); + return Config::instance()->dcp_filename_format().get(values) + ".mxf"; } string audio_asset_filename (shared_ptr asset) { - return "pcm_" + asset->id() + ".mxf"; + dcp::NameFormat::Map values; + values["type"] = "pcm"; + values["id"] = asset->id(); + return Config::instance()->dcp_filename_format().get(values) + ".mxf"; } -string -subtitle_content_filename (shared_ptr asset) +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); + } +} + +bool +string_not_empty (string s) { - return "sub_" + asset->id() + ".xml"; + return !s.empty (); }