X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=cc636b0bfb0d5bd40965935aa31296ad114cdcc7;hb=deb3fc481502a885f26b331c2118a082bdcd4467;hp=2d375cf037faecc63b3cbd94662cbd5b8f9a940a;hpb=e2ebf847ce9d6e74a1b9d768475b8ae552cfba82;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 2d375cf03..cc636b0bf 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -28,6 +28,7 @@ #include "overlaps.h" #include "compose.hpp" #include "dcp_decoder.h" +#include "log.h" #include "text_content.h" #include #include @@ -63,6 +64,8 @@ int const DCPContentProperty::NAME = 605; int const DCPContentProperty::TEXTS = 606; int const DCPContentProperty::CPL = 607; +#define LOG_GENERAL(...) this->film()->log()->log(String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL); + DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) , _encrypted (false) @@ -72,6 +75,8 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) , _reference_audio (false) , _three_d (false) { + LOG_GENERAL ("Creating DCP content from %1", p.string()); + read_directory (p); set_default_colour_conversion (); @@ -133,6 +138,11 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in } } _three_d = node->optional_bool_child("ThreeD").get_value_or (false); + + optional ck = node->optional_string_child("ContentKind"); + if (ck) { + _content_kind = dcp::content_kind_from_string (*ck); + } _cpl = node->optional_string_child("CPL"); BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) { _reel_lengths.push_back (raw_convert (i->content ())); @@ -142,13 +152,27 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in void DCPContent::read_directory (boost::filesystem::path p) { + LOG_GENERAL ("DCPContent::read_directory reads %1", p.string()); for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) { 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 ())) { + LOG_GENERAL ("Inside there's directory %1", i->path().string()); read_directory (i->path()); } } + + bool have_assetmap = false; + BOOST_FOREACH (boost::filesystem::path i, paths()) { + if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") { + have_assetmap = true; + } + } + + if (!have_assetmap) { + throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?"); + } } void @@ -209,6 +233,7 @@ DCPContent::examine (shared_ptr job) _kdm_valid = examiner->kdm_valid (); _standard = examiner->standard (); _three_d = examiner->three_d (); + _content_kind = examiner->content_kind (); _cpl = examiner->cpl (); _reel_lengths = examiner->reel_lengths (); } @@ -301,6 +326,9 @@ 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)); + } if (_cpl) { node->add_child("CPL")->add_child_text (_cpl.get ()); } @@ -550,7 +578,21 @@ DCPContent::can_reference_video (string& why_not) const return false; } - if (film()->frame_size() != video->size()) { + Resolution video_res = RESOLUTION_2K; + if (video->size().width > 2048 || video->size().height > 1080) { + video_res = RESOLUTION_4K; + } + + if (film()->resolution() != video_res) { + if (video_res == RESOLUTION_4K) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it is 4K and the film is 2K."); + } else { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it is 2K and the film is 4K."); + } + return false; + } else if (film()->frame_size() != video->size()) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("its video frame size differs from the film's."); return false; @@ -600,6 +642,7 @@ bool check_text (shared_ptr c) { return !c->text.empty(); } + bool DCPContent::can_reference_text (TextType type, string& why_not) const { @@ -620,7 +663,7 @@ DCPContent::can_reference_text (TextType type, string& why_not) const why_not = _("it does not have open subtitles in all its reels."); return false; } - if (type == TEXT_CLOSED_CAPTION && !i->closed_caption()) { + if (type == TEXT_CLOSED_CAPTION && 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; @@ -656,3 +699,14 @@ DCPContent::set_cpl (string id) _cpl = id; } } + +bool +DCPContent::kdm_timing_window_valid () const +{ + if (!_kdm) { + return true; + } + + dcp::LocalTime now; + return _kdm->not_valid_before() < now && now < _kdm->not_valid_after(); +}