X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=051a4bb25ec9e0b84fe6aa0d890ed4bf6f88f469;hp=0b35ad5395dfde0c59037a4af4542081650b7381;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hpb=5ae794047e5ceee4502e59211f0083a60224f4bd diff --git a/src/lib/util.cc b/src/lib/util.cc index 0b35ad539..051a4bb25 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,26 @@ #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 "audio_buffers.h" +#include #include -#include -#include -#include -#include +#include +#include +#include +#include +extern "C" { +#include +#include +#include +} +#include #include #include #include -#include -#include +#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -79,15 +87,21 @@ using std::pair; using std::cout; using std::bad_alloc; using std::set_terminate; +using std::make_pair; 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; +using dcp::locale_convert; /** Path to our executable, required by the stacktrace stuff and filled * in during App::onInit(). */ string program_name; +bool is_batch_converter = false; static boost::thread::id ui_thread; static boost::filesystem::path backtrace_file; @@ -106,14 +120,25 @@ seconds_to_hms (int s) int h = m / 60; m -= (h * 60); - SafeStringStream hms; - hms << h << N_(":"); - hms.width (2); - hms << setfill ('0') << m << N_(":"); - hms.width (2); - hms << setfill ('0') << s; + char buffer[64]; + snprintf (buffer, sizeof(buffer), "%d:%02d:%02d", h, m, s); + return buffer; +} - return hms.str (); +string +time_to_hmsf (DCPTime time, Frame rate) +{ + Frame f = time.frames_round (rate); + int s = f / rate; + f -= (s * rate); + int m = s / 60; + s -= m * 60; + int h = m / 60; + m -= h * 60; + + char buffer[64]; + snprintf (buffer, sizeof(buffer), "%d:%02d:%02d.%d", h, m, s, static_cast(f)); + return buffer; } /** @param s Number of seconds. @@ -127,48 +152,51 @@ seconds_to_approximate_hms (int s) int h = m / 60; m -= (h * 60); - SafeStringStream ap; + string ap; - bool const hours = h > 0; - bool const minutes = h < 10 && m > 0; - bool const seconds = m < 10 && s > 0; + bool hours = h > 0; + bool minutes = h < 6 && m > 0; + bool seconds = h == 0 && m < 10 && s > 0; - if (hours) { - if (m > 30 && !minutes) { - /// TRANSLATORS: h here is an abbreviation for hours - ap << (h + 1) << _("h"); - } else { - /// TRANSLATORS: h here is an abbreviation for hours - ap << h << _("h"); + if (m > 30 && !minutes) { + /* round up the hours */ + ++h; + } + if (s > 30 && !seconds) { + /* round up the minutes */ + ++m; + if (m == 60) { + m = 0; + minutes = false; + ++h; } + } + + if (hours) { + /// TRANSLATORS: h here is an abbreviation for hours + ap += locale_convert(h) + _("h"); - if (minutes | seconds) { - ap << N_(" "); + if (minutes || seconds) { + ap += N_(" "); } } 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"); - } + /// TRANSLATORS: m here is an abbreviation for minutes + ap += locale_convert(m) + _("m"); if (seconds) { - ap << N_(" "); + ap += N_(" "); } } if (seconds) { /* Seconds */ /// TRANSLATORS: s here is an abbreviation for seconds - ap << s << _("s"); + ap += locale_convert(s) + _("s"); } - return ap.str (); + return ap; } double @@ -184,7 +212,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 +226,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 +246,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 +263,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 +301,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,16 +326,31 @@ 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 + + av_register_all (); avfilter_register_all (); #ifdef DCPOMATIC_OSX - /* Add our lib directory to the libltdl search path so that + /* Add our library directory to the libltdl search path so that xmlsec can find xmlsec1-openssl. */ boost::filesystem::path lib = app_contents (); - lib /= "lib"; + lib /= "Frameworks"; setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1); #endif @@ -323,14 +358,17 @@ dcpomatic_setup () Pango::init (); dcp::init (); - + Ratio::setup_ratios (); + PresetColourConversion::setup_colour_conversion_presets (); VideoContentScale::setup_scales (); DCPContentType::setup_dcp_content_types (); Filter::setup_filters (); CinemaSoundProcessor::setup_cinema_sound_processors (); AudioProcessor::setup_audio_processors (); + curl_global_init (CURL_GLOBAL_ALL); + ui_thread = boost::this_thread::get_id (); } @@ -376,24 +414,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; @@ -402,7 +440,7 @@ md5_digest_head_tail (vector files, boost::uintmax_t si while (i < int64_t (files.size()) && to_do > 0) { FILE* f = fopen_boost (files[i], "rb"); if (!f) { - throw OpenFileError (files[i].string()); + throw OpenFileError (files[i].string(), errno, true); } boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); @@ -422,7 +460,7 @@ md5_digest_head_tail (vector files, boost::uintmax_t si while (i >= 0 && to_do > 0) { FILE* f = fopen_boost (files[i], "rb"); if (!f) { - throw OpenFileError (files[i].string()); + throw OpenFileError (files[i].string(), errno, true); } boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); @@ -433,28 +471,15 @@ 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. + * @param stride Array of numbers to round, indexed by c. * @param t Multiple to round to. * @return Rounded number. */ @@ -465,17 +490,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 () @@ -486,11 +500,10 @@ 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 - /// VI is the visually-impaired audio track (audio describe). + /// enhancement channel (sub-woofer). string const channels[] = { _("Left"), _("Right"), @@ -504,58 +517,99 @@ audio_channel_name (int c) _("Right centre"), _("Left rear surround"), _("Right rear surround"), + _("D-BOX primary"), + _("D-BOX secondary"), + _("Unused"), + _("Unused") }; return channels[c]; } +string +short_audio_channel_name (int c) +{ + DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16); + + /// TRANSLATORS: these are short names of audio channels; Lfe 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). DBP is the D-BOX + /// primary channel and DBS is the D-BOX secondary channel. + string const channels[] = { + _("L"), + _("R"), + _("C"), + _("Lfe"), + _("Ls"), + _("Rs"), + _("HI"), + _("VI"), + _("Lc"), + _("Rc"), + _("BsL"), + _("BsR"), + _("DBP"), + _("DBS"), + "", + "" + }; + + return channels[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" || ext == ".exr" || + ext == ".jpf" ); } +bool +valid_sound_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 == ".wav" || ext == ".mp3" || ext == ".aif" || ext == ".aiff"); +} + bool 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 tidy_for_filename (string f) { - string t; - for (size_t i = 0; i < f.length(); ++i) { - if (isalnum (f[i]) || f[i] == '_' || f[i] == '-') { - t += f[i]; - } else { - t += '_'; - } - } - - return t; + boost::replace_if (f, boost::is_any_of ("\\/:"), '_'); + return f; } 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 * @@ -568,22 +622,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) { @@ -592,7 +630,7 @@ split_get_request (string url) KEY, VALUE } state = AWAITING_QUESTION_MARK; - + map r; string k; string v; @@ -630,64 +668,117 @@ 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); +string +video_asset_filename (shared_ptr asset, int reel_index, int reel_count, optional summary) +{ + dcp::NameFormat::Map values; + values['t'] = "j2c"; + values['r'] = raw_convert (reel_index + 1); + values['n'] = raw_convert (reel_count); + if (summary) { + values['c'] = careful_string_filter (summary.get()); } - - DCPOMATIC_ASSERT (false); + return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf"); } -dcp::FrameInfo -read_frame_info (FILE* file, int frame, Eyes eyes) +string +audio_asset_filename (shared_ptr asset, int reel_index, int reel_count, optional summary) { - 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; + dcp::NameFormat::Map values; + values['t'] = "pcm"; + values['r'] = raw_convert (reel_index + 1); + values['n'] = raw_convert (reel_count); + if (summary) { + values['c'] = careful_string_filter (summary.get()); + } + return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf"); } -void -write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info) +float +relaxed_string_to_float (string s) { - 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); + try { + boost::algorithm::replace_all (s, ",", "."); + return lexical_cast (s); + } catch (bad_lexical_cast) { + boost::algorithm::replace_all (s, ".", ","); + return lexical_cast (s); + } } string -video_mxf_filename (shared_ptr mxf) +careful_string_filter (string s) { - return "j2c_" + mxf->id() + ".mxf"; + /* Filter out `bad' characters which `may' cause problems with some systems (either for DCP name or filename). + There's no apparent list of what really is allowed, so this is a guess. + Safety first and all that. + */ + + string out; + string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+"; + for (size_t i = 0; i < s.size(); ++i) { + if (allowed.find (s[i]) != string::npos) { + out += s[i]; + } + } + + return out; } -string -audio_mxf_filename (shared_ptr mxf) +/** @param mapped List of mapped audio channels from a Film. + * @param channels Total number of channels in the Film. + * @return First: number of non-LFE channels, second: number of LFE channels. + */ +pair +audio_channel_types (list mapped, int channels) +{ + int non_lfe = 0; + int lfe = 0; + + BOOST_FOREACH (int i, mapped) { + if (i >= channels) { + /* This channel is mapped but is not included in the DCP */ + continue; + } + + if (static_cast (i) == dcp::LFE) { + ++lfe; + } else { + ++non_lfe; + } + } + + return make_pair (non_lfe, lfe); +} + +shared_ptr +remap (shared_ptr input, int output_channels, AudioMapping map) { - return "pcm_" + mxf->id() + ".mxf"; + shared_ptr mapped (new AudioBuffers (output_channels, input->frames())); + mapped->make_silent (); + + for (int i = 0; i < map.input_channels(); ++i) { + for (int j = 0; j < mapped->channels(); ++j) { + if (map.get (i, static_cast (j)) > 0) { + mapped->accumulate_channel ( + input.get(), + i, + static_cast (j), + map.get (i, static_cast (j)) + ); + } + } + } + + return mapped; } -string -subtitle_content_filename (shared_ptr content) +Eyes +increment_eyes (Eyes e) { - return "sub_" + content->id() + ".xml"; + if (e == EYES_LEFT) { + return EYES_RIGHT; + } + + return EYES_LEFT; }