X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=193c9995aee57516e15a6a5143237c352282ef63;hp=6df0588e972fb439f6eb0b501bc9e1c7b5d99ea4;hb=HEAD;hpb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 6df0588e9..bdd5e0e09 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2022 Carl Hetherington + Copyright (C) 2014-2023 Carl Hetherington This file is part of DCP-o-matic. @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -49,6 +50,7 @@ using std::cout; using std::dynamic_pointer_cast; +using std::exception; using std::function; using std::list; using std::make_shared; @@ -86,25 +88,17 @@ DCPContent::DCPContent (boost::filesystem::path p) read_directory (p); set_default_colour_conversion (); - - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - _reference_text[i] = false; - } } DCPContent::DCPContent (cxml::ConstNodePtr node, int version) : Content (node) { - video = VideoContent::from_xml (this, node, version); + video = VideoContent::from_xml (this, node, version, VideoRange::FULL); audio = AudioContent::from_xml (this, node, version); list notes; text = TextContent::from_xml (this, node, version, notes); atmos = AtmosContent::from_xml (this, node); - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - _reference_text[i] = false; - } - if (video && audio) { audio->set_stream ( make_shared ( @@ -113,7 +107,8 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) node->optional_number_child("AudioLength").get_value_or ( video->length() * node->number_child("AudioFrameRate") / video_frame_rate().get() ), - AudioMapping (node->node_child ("AudioMapping"), version) + AudioMapping(node->node_child("AudioMapping"), version), + 24 ) ); } @@ -128,11 +123,11 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) _reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false); _reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false); if (version >= 37) { - _reference_text[static_cast(TextType::OPEN_SUBTITLE)] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false); - _reference_text[static_cast(TextType::CLOSED_CAPTION)] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false); + _reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false); + _reference_text[TextType::CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false); } else { - _reference_text[static_cast(TextType::OPEN_SUBTITLE)] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false); - _reference_text[static_cast(TextType::CLOSED_CAPTION)] = false; + _reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false); + _reference_text[TextType::CLOSED_CAPTION] = false; } if (node->optional_string_child("Standard")) { auto const s = node->optional_string_child("Standard").get(); @@ -148,7 +143,7 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) auto ck = node->optional_string_child("ContentKind"); if (ck) { - _content_kind = dcp::content_kind_from_string (*ck); + _content_kind = dcp::ContentKind::from_name(*ck); } _cpl = node->optional_string_child("CPL"); for (auto i: node->node_children("ReelLength")) { @@ -166,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 @@ -198,15 +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()); + 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()); } } @@ -218,6 +223,11 @@ DCPContent::examine (shared_ptr film, shared_ptr job) bool const needed_kdm = needs_kdm (); string const old_name = name (); + ContentChangeSignalDespatcher::instance()->suspend(); + dcp::ScopeGuard sg = []() { + ContentChangeSignalDespatcher::instance()->resume(); + }; + ContentChangeSignaller cc_texts (this, DCPContentProperty::TEXTS); ContentChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); ContentChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM); @@ -235,7 +245,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) boost::mutex::scoped_lock lm (_mutex); video = make_shared(this); } - video->take_from_examiner (examiner); + video->take_from_examiner(film, examiner); set_default_colour_conversion (); } @@ -244,11 +254,13 @@ DCPContent::examine (shared_ptr film, shared_ptr job) boost::mutex::scoped_lock lm (_mutex); audio = make_shared(this); } - auto as = make_shared(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()); + auto as = make_shared(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels(), 24); audio->set_stream (as); 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()) { @@ -263,17 +275,19 @@ DCPContent::examine (shared_ptr film, shared_ptr job) atmos->set_length (examiner->atmos_length()); } - list> new_text; + vector> new_text; 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()); + 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)); + examiner->add_fonts(c); new_text.push_back (c); } @@ -360,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"); @@ -369,8 +384,8 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const node->add_child("KDMValid")->add_child_text (_kdm_valid ? "1" : "0"); node->add_child("ReferenceVideo")->add_child_text (_reference_video ? "1" : "0"); node->add_child("ReferenceAudio")->add_child_text (_reference_audio ? "1" : "0"); - node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[static_cast(TextType::OPEN_SUBTITLE)] ? "1" : "0"); - node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[static_cast(TextType::CLOSED_CAPTION)] ? "1" : "0"); + node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[TextType::OPEN_SUBTITLE] ? "1" : "0"); + node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[TextType::CLOSED_CAPTION] ? "1" : "0"); if (_standard) { switch (_standard.get ()) { case dcp::Standard::INTEROP: @@ -385,7 +400,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const } node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); if (_content_kind) { - node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind)); + node->add_child("ContentKind")->add_child_text(_content_kind->name()); } if (_cpl) { node->add_child("CPL")->add_child_text (_cpl.get ()); @@ -408,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 @@ -442,9 +461,11 @@ DCPContent::identifier () const s += i->identifier () + " "; } + boost::mutex::scoped_lock lm(_mutex); + s += string (_reference_video ? "1" : "0"); - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - s += string (_reference_text[i] ? "1" : "0"); + for (auto text: _reference_text) { + s += string(text ? "1" : "0"); } return s; } @@ -537,7 +558,7 @@ DCPContent::set_reference_text (TextType type, bool r) { boost::mutex::scoped_lock lm (_mutex); - _reference_text[static_cast(type)] = r; + _reference_text[type] = r; } } @@ -646,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 @@ -676,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 @@ -702,23 +720,24 @@ 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; - } - } + if (audio && audio->stream()) { + auto const channels = audio->stream()->channels(); + if (channels != film->audio_channels()) { + why_not = String::compose(_("it has a different number of audio channels than the project; set the project to have %1 channels."), channels); + 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 @@ -729,6 +748,9 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; + } catch (DCPError &) { + /* We couldn't read the DCP, so it's probably missing */ + return false; } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; @@ -736,22 +758,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: " @@ -769,7 +782,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 @@ -780,11 +800,16 @@ 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; - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - _reference_text[i] = dc->_reference_text[i]; - } + _reference_text = dc->_reference_text; } void @@ -813,10 +838,31 @@ DCPContent::kdm_timing_window_valid () const Resolution DCPContent::resolution () const { - if (video->size().width > 2048 || video->size().height > 1080) { + if (video->size() && (video->size()->width > 2048 || video->size()->height > 1080)) { return Resolution::FOUR_K; } return Resolution::TWO_K; } + +void +DCPContent::check_font_ids() +{ + if (text.empty()) { + return; + } + + DCPExaminer examiner(shared_from_this(), true); + 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 + ); +} +