X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_content.cc;h=f3751b1d83e665c0ae909ab48ba749be7488b404;hb=6ac468554c7fea0dfaefde85fb6cdd0fceaf5cad;hp=e7bef573b172dcbf7e9e6278541bd9457b8ba46e;hpb=83d63bb331190db4372de4d0aaf8413c51f1eee4;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index e7bef573b..f3751b1d8 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -31,7 +31,6 @@ #include "job.h" #include "log.h" #include "overlaps.h" -#include "scope_guard.h" #include "text_content.h" #include "video_content.h" #include @@ -41,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +50,7 @@ using std::cout; using std::dynamic_pointer_cast; +using std::exception; using std::function; using std::list; using std::make_shared; @@ -160,6 +161,8 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) for (auto i: node->node_children("ContentVersion")) { _content_versions.push_back (i->content()); } + + _active_audio_channels = node->optional_number_child("ActiveAudioChannels"); } void @@ -192,17 +195,23 @@ DCPContent::read_directory (boost::filesystem::path p) void DCPContent::read_sub_directory (boost::filesystem::path p) { + using namespace boost::filesystem; + LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string()); - for (auto i: boost::filesystem::directory_iterator(p)) { - if (boost::filesystem::is_regular_file(i.path())) { - LOG_GENERAL ("Inside there's regular file %1", i.path().string()); - add_path (i.path()); - } else if (boost::filesystem::is_directory(i.path()) && i.path().filename() != ".AppleDouble") { - LOG_GENERAL ("Inside there's directory %1", i.path().string()); - read_sub_directory (i.path()); - } else { - LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast(boost::filesystem::status(i.path()).type())); + try { + for (auto i: directory_iterator(p)) { + if (is_regular_file(i.path())) { + LOG_GENERAL ("Inside there's regular file %1", i.path().string()); + add_path (i.path()); + } else if (is_directory(i.path()) && i.path().filename() != ".AppleDouble") { + LOG_GENERAL ("Inside there's directory %1", i.path().string()); + read_sub_directory (i.path()); + } else { + LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast(status(i.path()).type())); + } } + } catch (exception& e) { + LOG_GENERAL("Failed to iterate over %1: %2", p.string(), e.what()); } } @@ -215,7 +224,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) string const old_name = name (); ContentChangeSignalDespatcher::instance()->suspend(); - ScopeGuard sg = []() { + dcp::ScopeGuard sg = []() { ContentChangeSignalDespatcher::instance()->resume(); }; @@ -250,6 +259,8 @@ DCPContent::examine (shared_ptr film, shared_ptr job) auto m = as->mapping (); m.make_default (film ? film->audio_processor() : 0); as->set_mapping (m); + + _active_audio_channels = examiner->active_audio_channels(); } if (examiner->has_atmos()) { @@ -269,14 +280,14 @@ DCPContent::examine (shared_ptr film, shared_ptr job) for (int i = 0; i < examiner->text_count(TextType::OPEN_SUBTITLE); ++i) { auto c = make_shared(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE); c->set_language (examiner->open_subtitle_language()); - add_fonts_from_examiner(c, examiner->fonts()); + examiner->add_fonts(c); new_text.push_back (c); } for (int i = 0; i < examiner->text_count(TextType::CLOSED_CAPTION); ++i) { auto c = make_shared(this, TextType::CLOSED_CAPTION, TextType::CLOSED_CAPTION); c->set_dcp_track (examiner->dcp_text_track(i)); - add_fonts_from_examiner(c, examiner->fonts()); + examiner->add_fonts(c); new_text.push_back (c); } @@ -363,6 +374,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const } boost::mutex::scoped_lock lm (_mutex); + node->add_child("Name")->add_child_text (_name); node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); node->add_child("NeedsAssets")->add_child_text (_needs_assets ? "1" : "0"); @@ -411,6 +423,10 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const for (auto i: _content_versions) { node->add_child("ContentVersion")->add_child_text(i); } + + if (_active_audio_channels) { + node->add_child("ActiveAudioChannels")->add_child_text(raw_convert(*_active_audio_channels)); + } } DCPTime @@ -445,6 +461,8 @@ DCPContent::identifier () const s += i->identifier () + " "; } + boost::mutex::scoped_lock lm(_mutex); + s += string (_reference_video ? "1" : "0"); for (auto text: _reference_text) { s += string(text ? "1" : "0"); @@ -649,11 +667,6 @@ DCPContent::can_reference (shared_ptr film, function c) -{ - return static_cast(c->video) && c->video->use(); -} bool DCPContent::can_reference_video (shared_ptr film, string& why_not) const @@ -679,14 +692,16 @@ DCPContent::can_reference_video (shared_ptr film, string& why_not) c } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (film, bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not); + return can_reference( + film, + [](shared_ptr c) { + return static_cast(c->video) && c->video->use(); + }, + _("it overlaps other video content; remove the other content."), + why_not + ); } -static -bool check_audio (shared_ptr c) -{ - return static_cast(c->audio) && !c->audio->mapping().mapped_output_channels().empty(); -} bool DCPContent::can_reference_audio (shared_ptr film, string& why_not) const @@ -705,23 +720,16 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c return false; } - for (auto i: decoder->reels()) { - if (!i->main_sound()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have sound in all its reels."); - return false; - } - } - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (film, bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not); + return can_reference( + film, [](shared_ptr c) { + return static_cast(c->audio) && !c->audio->mapping().mapped_output_channels().empty(); + }, + _("it overlaps other audio content; remove the other content."), + why_not + ); } -static -bool check_text (shared_ptr c) -{ - return !c->text.empty(); -} bool DCPContent::can_reference_text (shared_ptr film, TextType type, string& why_not) const @@ -739,22 +747,13 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri for (auto i: decoder->reels()) { if (type == TextType::OPEN_SUBTITLE) { - if (!i->main_subtitle()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have open subtitles in all its reels."); - return false; - } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) { + if (i->main_subtitle() && i->main_subtitle()->entry_point().get_value_or(0) != 0) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written."); return false; } } if (type == TextType::CLOSED_CAPTION) { - if (i->closed_captions().empty()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have closed captions in all its reels."); - return false; - } for (auto j: i->closed_captions()) { if (j->entry_point().get_value_or(0) != 0) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " @@ -772,7 +771,14 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); + return can_reference( + film, + [type](shared_ptr c) { + return std::find_if(c->text.begin(), c->text.end(), [type](shared_ptr t) { return t->type() == type; }) != c->text.end(); + }, + _("they overlap other text content; remove the other content."), + why_not + ); } void @@ -783,6 +789,13 @@ DCPContent::take_settings_from (shared_ptr c) return; } + if (this == dc.get()) { + return; + } + + boost::mutex::scoped_lock lm(_mutex); + boost::mutex::scoped_lock lm2(dc->_mutex); + _reference_video = dc->_reference_video; _reference_audio = dc->_reference_audio; _reference_text = dc->_reference_text; @@ -822,33 +835,6 @@ DCPContent::resolution () const } -void -add_fonts_from_examiner(shared_ptr text, vector>> const & all_fonts) -{ - int reel_number = 0; - for (auto reel_fonts: all_fonts) { - for (auto font: reel_fonts) { - /* Each reel could have its own font with the same ID, so we disambiguate them here - * by prepending the reel number. We do the same disambiguation when emitting the - * subtitles in the DCP decoder. - */ - auto font_copy = make_shared(*font); - font_copy->set_id(id_for_font_in_reel(font->id(), reel_number)); - text->add_font(font_copy); - } - ++reel_number; - } - -} - - -string -id_for_font_in_reel(string id, int reel) -{ - return String::compose("%1_%2", reel, id); -} - - void DCPContent::check_font_ids() { @@ -857,6 +843,15 @@ DCPContent::check_font_ids() } DCPExaminer examiner(shared_from_this(), true); - add_fonts_from_examiner(text.front(), examiner.fonts()); + examiner.add_fonts(text.front()); +} + + +int +DCPContent::active_audio_channels() const +{ + return _active_audio_channels.get_value_or( + (audio && audio->stream()) ? audio->stream()->channels() : 0 + ); }