X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=09f32dfda5d4b541fe5c4874a041fc47aeb6f3bf;hb=fe9d2a290682021cd12a00bf21fa4db3012e2049;hp=ede1d4e9b5c16bdee34c0c2ec7fd23db1e1bb7a2;hpb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index ede1d4e9b..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 +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_(" "); } } @@ -280,18 +289,10 @@ terminate () 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()). @@ -307,6 +308,20 @@ dcpomatic_setup () std::locale::global (boost::locale::generator().generate ("")); boost::filesystem::path::imbue (std::locale ()); #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 (); @@ -334,6 +349,10 @@ dcpomatic_setup () curl_global_init (CURL_GLOBAL_ALL); +#ifdef DCPOMATIC_GRAPHICS_MAGICK + Magick::InitializeMagick (0); +#endif + ui_thread = boost::this_thread::get_id (); } @@ -393,10 +412,10 @@ dcpomatic_setup_gettext_i18n (string lang) /** 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; @@ -465,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 @@ -483,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]; @@ -531,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 * @@ -547,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) { @@ -612,11 +619,35 @@ split_get_request (string url) 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"; +} + +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 !s.empty (); }