X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Futil.cc;h=cfeacdb92cece74e3c0049081bba2964ace11fdb;hb=HEAD;hp=7680f26323fbb86d2ad07bdac4f8274acb2766e5;hpb=da38c8a0156808595be0aae1b1490069a663fb78;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 7680f2632..fdc647fba 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -33,7 +33,6 @@ #include "config.h" #include "constants.h" #include "cross.h" -#include "crypto.h" #include "dcp_content_type.h" #include "dcpomatic_log.h" #include "digester.h" @@ -53,9 +52,12 @@ #include "video_content.h" #include #include +#include +#include #include #include #include +#include #include #include #include @@ -73,6 +75,7 @@ LIBDCP_ENABLE_WARNINGS #include #include #include +#include #include #include #include @@ -81,7 +84,6 @@ LIBDCP_DISABLE_WARNINGS #include LIBDCP_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS -#include #include #endif #include @@ -361,6 +363,58 @@ dcpomatic_setup_path_encoding () #endif } + +class LogSink : public Kumu::ILogSink +{ +public: + LogSink () {} + LogSink (LogSink const&) = delete; + LogSink& operator= (LogSink const&) = delete; + + void WriteEntry(const Kumu::LogEntry& entry) override { + Kumu::AutoMutex L(m_lock); + WriteEntryToListeners(entry); + if (entry.TestFilter(m_filter)) { + string buffer; + entry.CreateStringWithOptions(buffer, m_options); + LOG_GENERAL("asdcplib: %1", buffer); + } + } +}; + + +void +capture_asdcp_logs () +{ + static LogSink log_sink; + Kumu::SetDefaultLogSink(&log_sink); +} + + +static +void +ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +{ + if (level > AV_LOG_WARNING) { + return; + } + + char line[1024]; + static int prefix = 0; + av_log_format_line(ptr, level, fmt, vl, line, sizeof (line), &prefix); + string str(line); + boost::algorithm::trim(str); + dcpomatic_log->log(String::compose("FFmpeg: %1", str), LogEntry::TYPE_GENERAL); +} + + +void +capture_ffmpeg_logs() +{ + av_log_set_callback(ffmpeg_log_callback); +} + + /** 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. */ @@ -394,7 +448,13 @@ LIBDCP_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS putenv ("PANGOCAIRO_BACKEND=fontconfig"); - putenv (String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str()); + if (dcp::filesystem::exists(resources_path() / "fonts.conf")) { + /* The actual application after installation */ + putenv(String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str()); + } else { + /* The place where fonts.conf is during tests */ + putenv("FONTCONFIG_PATH=build\\fonts"); + } #endif #ifdef DCPOMATIC_OSX @@ -407,12 +467,12 @@ LIBDCP_ENABLE_WARNINGS #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) /* Render something to fontconfig to create its cache */ - list subs; + vector subs; dcp::SubtitleString ss( optional(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, 0, dcp::Direction::LTR, - "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0 + "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0, std::vector() ); - subs.push_back (StringText(ss, 0, {}, dcp::Standard::SMPTE)); + subs.push_back(StringText(ss, 0, make_shared("foo"), dcp::SubtitleStandard::SMPTE_2014)); render_text (subs, dcp::Size(640, 480), DCPTime(), 24); #endif @@ -428,6 +488,7 @@ LIBDCP_ENABLE_WARNINGS ui_thread = boost::this_thread::get_id (); capture_asdcp_logs (); + capture_ffmpeg_logs(); } #ifdef DCPOMATIC_WINDOWS @@ -501,7 +562,7 @@ digest_head_tail (vector files, boost::uintmax_t size) throw OpenFileError (files[i].string(), errno, OpenFileError::READ); } - boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + auto this_time = min(to_do, dcp::filesystem::file_size(files[i])); f.checked_read(p, this_time); p += this_time; to_do -= this_time; @@ -520,7 +581,7 @@ digest_head_tail (vector files, boost::uintmax_t size) throw OpenFileError (files[i].string(), errno, OpenFileError::READ); } - boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + auto this_time = min(to_do, dcp::filesystem::file_size(files[i])); f.seek(-this_time, SEEK_END); f.checked_read(p, this_time); p += this_time; @@ -537,7 +598,8 @@ digest_head_tail (vector files, boost::uintmax_t size) string simple_digest (vector paths) { - return digest_head_tail(paths, 1000000) + raw_convert(boost::filesystem::file_size(paths.front())); + DCP_ASSERT(!paths.empty()); + return digest_head_tail(paths, 1000000) + raw_convert(dcp::filesystem::file_size(paths.front())); } @@ -612,7 +674,7 @@ short_audio_channel_name (int c) bool valid_image_file (boost::filesystem::path f) { - if (boost::starts_with (f.leaf().string(), "._")) { + if (boost::starts_with(f.filename().string(), "._")) { return false; } @@ -629,7 +691,7 @@ valid_image_file (boost::filesystem::path f) bool valid_sound_file (boost::filesystem::path f) { - if (boost::starts_with (f.leaf().string(), "._")) { + if (boost::starts_with(f.filename().string(), "._")) { return false; } @@ -663,53 +725,6 @@ fit_ratio_within (float ratio, dcp::Size full_frame) return dcp::Size (full_frame.width, lrintf (full_frame.width / ratio)); } -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; -} - - static string asset_filename (shared_ptr asset, string type, int reel_index, int reel_count, optional summary, string extension) @@ -719,9 +734,9 @@ asset_filename (shared_ptr asset, string type, int reel_index, int r values['r'] = raw_convert(reel_index + 1); values['n'] = raw_convert(reel_count); if (summary) { - values['c'] = careful_string_filter(summary.get()); + values['c'] = summary.get(); } - return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension); + return careful_string_filter(Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension)); } @@ -753,18 +768,6 @@ atmos_asset_filename (shared_ptr asset, int reel_index, int ree } -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); - } -} - string careful_string_filter (string s) { @@ -797,7 +800,7 @@ careful_string_filter (string s) /* Then remove anything that's not in a very limited character set */ wstring out; - wstring const allowed = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+"; + wstring const allowed = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.+"; for (int i = 0; i < transliterated_more.length(); ++i) { wchar_t c = transliterated_more[i]; if (allowed.find(c) != string::npos) { @@ -837,6 +840,8 @@ audio_channel_types (list mapped, int channels) case dcp::Channel::BSR: ++non_lfe; break; + case dcp::Channel::LC: + case dcp::Channel::RC: case dcp::Channel::HI: case dcp::Channel::VI: case dcp::Channel::MOTION_DATA: @@ -904,28 +909,6 @@ utf8_strlen (string s) return N; } -string -day_of_week_to_string (boost::gregorian::greg_weekday d) -{ - switch (d.as_enum()) { - case boost::date_time::Sunday: - return _("Sunday"); - case boost::date_time::Monday: - return _("Monday"); - case boost::date_time::Tuesday: - return _("Tuesday"); - case boost::date_time::Wednesday: - return _("Wednesday"); - case boost::date_time::Thursday: - return _("Thursday"); - case boost::date_time::Friday: - return _("Friday"); - case boost::date_time::Saturday: - return _("Saturday"); - } - - return d.as_long_string (); -} /** @param size Size of picture that the subtitle will be overlaid onto */ void @@ -966,60 +949,6 @@ emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size decoder->emit_bitmap (period, image, rect); } -bool -show_jobs_on_console (bool progress) -{ - bool first = true; - bool error = false; - while (true) { - - dcpomatic_sleep_seconds (5); - - auto jobs = JobManager::instance()->get(); - - if (!first && progress) { - for (size_t i = 0; i < jobs.size(); ++i) { - cout << "\033[1A\033[2K"; - } - cout.flush (); - } - - first = false; - - for (auto i: jobs) { - if (progress) { - cout << i->name(); - if (!i->sub_name().empty()) { - cout << "; " << i->sub_name(); - } - cout << ": "; - - if (i->progress ()) { - cout << i->status() << " \n"; - } else { - cout << ": Running \n"; - } - } - - if (!progress && i->finished_in_error()) { - /* We won't see this error if we haven't been showing progress, - so show it now. - */ - cout << i->status() << "\n"; - } - - if (i->finished_in_error()) { - error = true; - } - } - - if (!JobManager::instance()->work_to_do()) { - break; - } - } - - return error; -} /** XXX: could use mmap? */ void @@ -1039,7 +968,7 @@ copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::fun std::vector buffer(chunk); - boost::uintmax_t const total = boost::filesystem::file_size (from); + auto const total = dcp::filesystem::file_size(from); boost::uintmax_t remaining = total; while (remaining) { @@ -1111,7 +1040,7 @@ default_font_file () boost::filesystem::path liberation_normal; try { liberation_normal = resources_path() / "LiberationSans-Regular.ttf"; - if (!boost::filesystem::exists (liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { /* Hack for unit tests */ liberation_normal = resources_path() / "fonts" / "LiberationSans-Regular.ttf"; } @@ -1119,10 +1048,10 @@ default_font_file () } - if (!boost::filesystem::exists(liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"; } - if (!boost::filesystem::exists(liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { liberation_normal = "/usr/share/fonts/liberation-sans/LiberationSans-Regular.ttf"; } @@ -1130,14 +1059,6 @@ default_font_file () } -string -to_upper (string s) -{ - transform (s.begin(), s.end(), s.begin(), ::toupper); - return s; -} - - /* Set to 1 to print the IDs of some of our threads to stdout on creation */ #define DCPOMATIC_DEBUG_THREADS 0 @@ -1156,43 +1077,79 @@ start_of_thread (string) #endif -class LogSink : public Kumu::ILogSink +string +error_details(boost::system::error_code ec) { -public: - LogSink () {} - LogSink (LogSink const&) = delete; - LogSink& operator= (LogSink const&) = delete; - - void WriteEntry(const Kumu::LogEntry& entry) override { - Kumu::AutoMutex L(m_lock); - WriteEntryToListeners(entry); - if (entry.TestFilter(m_filter)) { - string buffer; - entry.CreateStringWithOptions(buffer, m_options); - LOG_GENERAL("asdcplib: %1", buffer); - } - } -}; + return String::compose("%1:%2:%3", ec.category().name(), ec.value(), ec.message()); +} -void -capture_asdcp_logs () +bool +contains_assetmap(boost::filesystem::path dir) { - static LogSink log_sink; - Kumu::SetDefaultLogSink(&log_sink); + return dcp::filesystem::is_regular_file(dir / "ASSETMAP") || dcp::filesystem::is_regular_file(dir / "ASSETMAP.xml"); } string -error_details(boost::system::error_code ec) +word_wrap(string input, int columns) { - return String::compose("%1:%2:%3", ec.category().name(), ec.value(), ec.message()); + icu::Locale locale; + UErrorCode status = U_ZERO_ERROR; + auto iter = icu::BreakIterator::createLineInstance(locale, status); + dcp::ScopeGuard sg = [iter]() { delete iter; }; + if (U_FAILURE(status)) { + return input; + } + + auto input_icu = icu::UnicodeString::fromUTF8(icu::StringPiece(input)); + iter->setText(input_icu); + + int position = 0; + string output; + while (position < input_icu.length()) { + int end_of_line = iter->preceding(position + columns + 1); + icu::UnicodeString line; + if (end_of_line <= position) { + /* There's no good line-break position; just break in the middle of a word */ + line = input_icu.tempSubString(position, columns); + position += columns; + } else { + line = input_icu.tempSubString(position, end_of_line - position); + position = end_of_line; + } + line.toUTF8String(output); + output += "\n"; + } + + return output; } -bool -contains_assetmap(boost::filesystem::path dir) +string +screen_names_to_string(vector names) { - return boost::filesystem::is_regular_file(dir / "ASSETMAP") || boost::filesystem::is_regular_file(dir / "ASSETMAP.xml"); + if (names.empty()) { + return {}; + } + + auto number = [](string const& s) { + return s.find_first_not_of("0123456789") == string::npos; + }; + + if (std::find_if(names.begin(), names.end(), [number](string const& s) { return !number(s); }) == names.end()) { + std::sort(names.begin(), names.end(), [](string const& a, string const& b) { + return dcp::raw_convert(a) < dcp::raw_convert(b); + }); + } else { + std::sort(names.begin(), names.end()); + } + + string result; + for (auto const& name: names) { + result += name + ", "; + } + + return result.substr(0, result.length() - 2); }