X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fhints.cc;h=4d3b2d95ee91161fddbde42a84fe3ab17c5e5322;hp=ffe6d8e73b131f77600518d38d50de720b46ea90;hb=39fb8198febde1937019db1c300ec363aab5aa56;hpb=191b9aece985643210dc6b2352b390cdfc386f4d diff --git a/src/lib/hints.cc b/src/lib/hints.cc index ffe6d8e73..4d3b2d95e 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2020 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "dcp_content_type.h" #include "hints.h" #include "types.h" @@ -27,6 +28,7 @@ #include "text_content.h" #include "audio_processor.h" #include "font.h" +#include "font_data.h" #include "ratio.h" #include "audio_analysis.h" #include "compose.hpp" @@ -39,20 +41,21 @@ #include #include #include -#include #include #include #include "i18n.h" -using std::vector; -using std::string; -using std::pair; -using std::min; -using std::max; + using std::cout; -using boost::shared_ptr; -using boost::weak_ptr; +using std::make_shared; +using std::max; +using std::min; +using std::pair; +using std::shared_ptr; +using std::string; +using std::vector; +using std::weak_ptr; using boost::optional; using boost::bind; using namespace dcpomatic; @@ -67,28 +70,28 @@ using namespace boost::placeholders; #define SIZE_SLACK 4096 -Hints::Hints (weak_ptr film) - : WeakConstFilm (film) - , _writer (new Writer(film, weak_ptr(), true)) - , _long_ccap (false) - , _overlap_ccap (false) - , _too_many_ccap_lines (false) - , _early_subtitle (false) - , _short_subtitle (false) - , _subtitles_too_close (false) - , _too_many_subtitle_lines (false) - , _long_subtitle (false) +/* When writing hints: + * - put quotation marks around the name of a GUI tab that you are referring to (e.g. "DCP" or "DCP→Video" tab) + */ + + +Hints::Hints (weak_ptr weak_film) + : WeakConstFilm (weak_film) + , _writer (new Writer(weak_film, weak_ptr(), true)) + , _analyser (film(), film()->playlist(), true, [](float) {}) , _stop (false) { } + void Hints::start () { _thread = boost::thread (bind(&Hints::thread, this)); } + Hints::~Hints () { boost::this_thread::disable_interruption dis; @@ -113,7 +116,7 @@ Hints::check_few_audio_channels () void Hints::check_upmixers () { - AudioProcessor const * ap = film()->audio_processor(); + auto ap = film()->audio_processor(); if (ap && (ap->id() == "stereo-5.1-upmix-a" || ap->id() == "stereo-5.1-upmix-b")) { hint (_("You are using DCP-o-matic's stereo-to-5.1 upmixer. This is experimental and may result in poor-quality audio. If you continue, you should listen to the resulting DCP in a cinema to make sure that it sounds good.")); } @@ -125,9 +128,9 @@ Hints::check_incorrect_container () { int narrower_than_scope = 0; int scope = 0; - BOOST_FOREACH (shared_ptr i, film()->content()) { + for (auto i: film()->content()) { if (i->video) { - Ratio const * r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size()).ratio()); + auto const r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size()).ratio()); if (r && r->id() == "239") { ++scope; } else if (r && r->id() != "239" && r->id() != "235" && r->id() != "190") { @@ -151,8 +154,8 @@ Hints::check_incorrect_container () void Hints::check_unusual_container () { - string const film_container = film()->container()->id(); - if (film_container != "185" && film_container != "239" && film_container != "190") { + auto const film_container = film()->container()->id(); + if (film_container != "185" && film_container != "239") { hint (_("Your DCP uses an unusual container ratio. This may cause problems on some projectors. If possible, use Flat or Scope for the DCP container ratio")); } } @@ -170,7 +173,7 @@ Hints::check_high_j2k_bandwidth () void Hints::check_frame_rate () { - shared_ptr f = film (); + auto f = film (); switch (f->video_frame_rate()) { case 24: /* Fine */ @@ -200,12 +203,22 @@ Hints::check_frame_rate () } +void +Hints::check_4k_3d () +{ + auto f = film(); + if (f->resolution() == Resolution::FOUR_K && f->three_d()) { + hint (_("4K 3D is only supported by a very limited number of projectors. Unless you know that you will play this DCP back on a capable projector, it is advisable to set the DCP to be 2K in the \"DCP→Video\" tab.")); + } +} + + void Hints::check_speed_up () { optional lowest_speed_up; optional highest_speed_up; - BOOST_FOREACH (shared_ptr i, film()->content()) { + for (auto i: film()->content()) { double spu = film()->active_frame_rate_change(i->position()).speed_up; if (!lowest_speed_up || spu < *lowest_speed_up) { lowest_speed_up = spu; @@ -230,15 +243,24 @@ Hints::check_speed_up () } +void +Hints::check_interop () +{ + if (film()->interop()) { + hint (_("In general it is now advisable to make SMPTE DCPs unless you have a particular reason to use Interop. You are advised to set your DCP to use the SMPTE standard in the \"DCP\" tab.")); + } +} + + void Hints::check_big_font_files () { bool big_font_files = false; if (film()->interop ()) { - BOOST_FOREACH (shared_ptr i, film()->content()) { - BOOST_FOREACH (shared_ptr j, i->text) { - BOOST_FOREACH (shared_ptr k, j->fonts()) { - optional const p = k->file (); + for (auto i: film()->content()) { + for (auto j: i->text) { + for (auto k: j->fonts()) { + auto const p = k->file (); if (p && boost::filesystem::file_size(p.get()) >= (MAX_FONT_FILE_SIZE - SIZE_SLACK)) { big_font_files = true; } @@ -257,8 +279,8 @@ void Hints::check_vob () { int vob = 0; - BOOST_FOREACH (shared_ptr i, film()->content()) { - if (boost::algorithm::starts_with (i->path(0).filename().string(), "VTS_")) { + for (auto i: film()->content()) { + if (boost::algorithm::starts_with(i->path(0).filename().string(), "VTS_")) { ++vob; } } @@ -273,8 +295,8 @@ void Hints::check_3d_in_2d () { int three_d = 0; - BOOST_FOREACH (shared_ptr i, film()->content()) { - if (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) { + for (auto i: film()->content()) { + if (i->video && i->video->frame_type() != VideoFrameType::TWO_D) { ++three_d; } } @@ -285,42 +307,46 @@ Hints::check_3d_in_2d () } -void +/** @return true if the loudness could be checked, false if it could not because no analysis was available */ +bool Hints::check_loudness () { - boost::filesystem::path path = film()->audio_analysis_path(film()->playlist()); - if (boost::filesystem::exists (path)) { - try { - shared_ptr an (new AudioAnalysis (path)); + auto path = film()->audio_analysis_path(film()->playlist()); + if (!boost::filesystem::exists(path)) { + return false; + } - string ch; + try { + auto an = make_shared(path); - vector sample_peak = an->sample_peak (); - vector true_peak = an->true_peak (); + string ch; - for (size_t i = 0; i < sample_peak.size(); ++i) { - float const peak = max (sample_peak[i].peak, true_peak.empty() ? 0 : true_peak[i]); - float const peak_dB = linear_to_db(peak) + an->gain_correction(film()->playlist()); - if (peak_dB > -3) { - ch += dcp::raw_convert (short_audio_channel_name (i)) + ", "; - } + auto sample_peak = an->sample_peak (); + auto true_peak = an->true_peak (); + + for (size_t i = 0; i < sample_peak.size(); ++i) { + float const peak = max (sample_peak[i].peak, true_peak.empty() ? 0 : true_peak[i]); + float const peak_dB = linear_to_db(peak) + an->gain_correction(film()->playlist()); + if (peak_dB > -3) { + ch += dcp::raw_convert(short_audio_channel_name(i)) + ", "; } + } - ch = ch.substr (0, ch.length() - 2); + ch = ch.substr (0, ch.length() - 2); - if (!ch.empty ()) { - hint (String::compose ( - _("Your audio level is very high (on %1). You should reduce the gain of your audio content."), - ch - ) - ); - } - } catch (OldFormatError& e) { - /* The audio analysis is too old to load in; just skip this hint as if - it had never been run. - */ + if (!ch.empty()) { + hint(String::compose( + _("Your audio level is very high (on %1). You should reduce the gain of your audio content."), + ch + ) + ); } + } catch (OldFormatError& e) { + /* The audio analysis is too old to load in */ + return false; } + + return true; } @@ -332,16 +358,32 @@ subtitle_mxf_too_big (shared_ptr asset) } +void +Hints::check_out_of_range_markers () +{ + auto const length = film()->length(); + for (auto const& i: film()->markers()) { + if (i.second >= length) { + hint (_("At least one marker comes after the end of the project and will be ignored.")); + } + } +} + + void Hints::thread () +try { - shared_ptr film = _film.lock (); + start_of_thread ("Hints"); + + auto film = _film.lock (); if (!film) { return; } - ContentList content = film->content (); + auto content = film->content (); + check_interop (); check_big_font_files (); check_few_audio_channels (); check_upmixers (); @@ -349,61 +391,74 @@ Hints::thread () check_unusual_container (); check_high_j2k_bandwidth (); check_frame_rate (); + check_4k_3d (); check_speed_up (); check_vob (); check_3d_in_2d (); - check_loudness (); + auto const check_loudness_done = check_loudness (); check_ffec_and_ffmc_in_smpte_feature (); + check_out_of_range_markers (); + check_text_languages (); - emit (bind(boost::ref(Progress), _("Examining closed captions"))); + if (check_loudness_done) { + emit (bind(boost::ref(Progress), _("Examining subtitles and closed captions"))); + } else { + emit (bind(boost::ref(Progress), _("Examining audio, subtitles and closed captions"))); + } - shared_ptr player (new Player(film)); + auto player = make_shared(film); player->set_ignore_video (); - player->set_ignore_audio (); + if (check_loudness_done) { + /* We don't need to analyse audio because we already loaded a suitable analysis */ + player->set_ignore_audio (); + } + player->Audio.connect (bind(&Hints::audio, this, _1, _2)); player->Text.connect (bind(&Hints::text, this, _1, _2, _3, _4)); struct timeval last_pulse; gettimeofday (&last_pulse, 0); - try { - while (!player->pass()) { + while (!player->pass()) { - struct timeval now; - gettimeofday (&now, 0); - if ((seconds(now) - seconds(last_pulse)) > 1) { - if (_stop) { - break; - } - emit (bind (boost::ref(Pulse))); - last_pulse = now; + struct timeval now; + gettimeofday (&now, 0); + if ((seconds(now) - seconds(last_pulse)) > 1) { + if (_stop) { + return; } + emit (bind (boost::ref(Pulse))); + last_pulse = now; } - } catch (...) { - store_current (); + } + + if (!check_loudness_done) { + _analyser.finish (); + _analyser.get().write(film->audio_analysis_path(film->playlist())); + check_loudness (); } _writer->write (player->get_subtitle_fonts()); + if (_long_subtitle && !_very_long_subtitle) { + hint (_("At least one of your subtitle lines has more than 52 characters. It is recommended to make each line 52 characters at most in length.")); + } else if (_very_long_subtitle) { + hint (_("At least one of your subtitle lines has more than 79 characters. You should make each line 79 characters at most in length.")); + } + bool ccap_xml_too_big = false; bool ccap_mxf_too_big = false; bool subs_mxf_too_big = false; - boost::filesystem::path dcp_dir = film->dir("hints") / dcpomatic::get_process_id(); + auto dcp_dir = film->dir("hints") / dcpomatic::get_process_id(); boost::filesystem::remove_all (dcp_dir); - try { - _writer->finish (film->dir("hints") / dcpomatic::get_process_id()); - } catch (...) { - store_current (); - emit (bind(boost::ref(Finished))); - return; - } + _writer->finish (film->dir("hints") / dcpomatic::get_process_id()); dcp::DCP dcp (dcp_dir); dcp.read (); DCPOMATIC_ASSERT (dcp.cpls().size() == 1); - BOOST_FOREACH (shared_ptr reel, dcp.cpls().front()->reels()) { - BOOST_FOREACH (shared_ptr ccap, reel->closed_captions()) { + for (auto reel: dcp.cpls()[0]->reels()) { + for (auto ccap: reel->closed_captions()) { if (ccap->asset() && ccap->asset()->xml_as_string().length() > static_cast(MAX_CLOSED_CAPTION_XML_SIZE - SIZE_SLACK) && !ccap_xml_too_big) { hint (_( "At least one of your closed caption files' XML part is larger than " MAX_CLOSED_CAPTION_XML_SIZE_TEXT @@ -431,6 +486,15 @@ Hints::thread () emit (bind(boost::ref(Finished))); } +catch (boost::thread_interrupted) +{ + /* The Hints object is being destroyed before it has finished, so just give up */ +} +catch (...) +{ + store_current (); +} + void Hints::hint (string h) @@ -438,16 +502,24 @@ Hints::hint (string h) emit(bind(boost::ref(Hint), h)); } + +void +Hints::audio (shared_ptr audio, DCPTime time) +{ + _analyser.analyse (audio, time); +} + + void Hints::text (PlayerText text, TextType type, optional track, DCPTimePeriod period) { _writer->write (text, type, track, period); switch (type) { - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: closed_caption (text, period); break; - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: open_subtitle (text, period); break; default: @@ -460,7 +532,7 @@ void Hints::closed_caption (PlayerText text, DCPTimePeriod period) { int lines = text.string.size(); - BOOST_FOREACH (StringText i, text.string) { + for (auto i: text.string) { if (utf8_strlen(i.text()) > MAX_CLOSED_CAPTION_LENGTH) { ++lines; if (!_long_ccap) { @@ -517,13 +589,16 @@ Hints::open_subtitle (PlayerText text, DCPTimePeriod period) } size_t longest_line = 0; - BOOST_FOREACH (StringText const& i, text.string) { + for (auto const& i: text.string) { longest_line = max (longest_line, i.text().length()); } - if (longest_line > 52 && !_long_subtitle) { + if (longest_line > 52) { _long_subtitle = true; - hint (_("At least one of your subtitle lines has more than 52 characters. It is advisable to make each line 52 characters at most in length.")); + } + + if (longest_line > 79) { + _very_long_subtitle = true; } _last_subtitle = period; @@ -533,9 +608,9 @@ Hints::open_subtitle (PlayerText text, DCPTimePeriod period) void Hints::check_ffec_and_ffmc_in_smpte_feature () { - shared_ptr f = film(); - if (!f->interop() && f->dcp_content_type()->libdcp_kind() == dcp::FEATURE && (!f->marker(dcp::FFEC) || !f->marker(dcp::FFMC))) { - hint (_("SMPTE DCPs with the type FTR (feature) should have markers for the first frame of end credits (FFEC) and the first frame of moving credits (FFMC). You should add these markers using the 'Markers' button in the DCP tab.")); + auto f = film(); + if (!f->interop() && f->dcp_content_type()->libdcp_kind() == dcp::ContentKind::FEATURE && (!f->marker(dcp::Marker::FFEC) || !f->marker(dcp::Marker::FFMC))) { + hint (_("SMPTE DCPs with the type FTR (feature) should have markers for the first frame of end credits (FFEC) and the first frame of moving credits (FFMC). You should add these markers using the 'Markers' button in the \"DCP\" tab.")); } } @@ -545,3 +620,19 @@ Hints::join () { _thread.join (); } + + +void +Hints::check_text_languages () +{ + for (auto i: film()->content()) { + for (auto j: i->text) { + if (j->use() && !j->language()) { + hint (_("At least one piece of subtitle or closed caption content has no specified language. " + "It is advisable to set the language for each piece of subtitle or closed caption content " + "in the \"Content→Timed text\", \"Content→Open subtitles\" or \"Content→Closed captions\" tab.")); + return; + } + } + } +}