X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=dc32a243e89245221ec37b9906626bf31a39d6b3;hb=8726c70cc1b14dc996c18670cdcda0b4d670605e;hp=a14dbaf5f0dd2629dd0975ccead07a18c0b71965;hpb=5ec3db95b5470bfff45c71b29d3625bc5a9090d0;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index a14dbaf5f..dc32a243e 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -51,16 +51,20 @@ using boost::shared_ptr; using boost::scoped_ptr; using boost::optional; using boost::function; +using boost::dynamic_pointer_cast; using dcp::raw_convert; -int const DCPContentProperty::CAN_BE_PLAYED = 600; -int const DCPContentProperty::REFERENCE_VIDEO = 601; -int const DCPContentProperty::REFERENCE_AUDIO = 602; -int const DCPContentProperty::REFERENCE_SUBTITLE = 603; +int const DCPContentProperty::NEEDS_ASSETS = 600; +int const DCPContentProperty::NEEDS_KDM = 601; +int const DCPContentProperty::REFERENCE_VIDEO = 602; +int const DCPContentProperty::REFERENCE_AUDIO = 603; +int const DCPContentProperty::REFERENCE_SUBTITLE = 604; +int const DCPContentProperty::NAME = 605; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) , _encrypted (false) + , _needs_assets (false) , _kdm_valid (false) , _reference_video (false) , _reference_audio (false) @@ -95,8 +99,8 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in ); _name = node->string_child ("Name"); - _encrypted = node->bool_child ("Encrypted"); + _needs_assets = node->optional_bool_child("NeedsAssets").get_value_or (false); if (node->optional_node_child ("KDM")) { _kdm = dcp::EncryptedKDM (node->string_child ("KDM")); } @@ -115,6 +119,7 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in } } _three_d = node->optional_bool_child("ThreeD").get_value_or (false); + _cpl = node->optional_string_child("CPL"); } void @@ -132,7 +137,9 @@ DCPContent::read_directory (boost::filesystem::path p) void DCPContent::examine (shared_ptr job) { - bool const could_be_played = can_be_played (); + bool const needed_assets = needs_assets (); + bool const needed_kdm = needs_kdm (); + string const old_name = name (); job->set_progress_unknown (); Content::examine (job); @@ -160,13 +167,23 @@ DCPContent::examine (shared_ptr job) subtitle.reset (new SubtitleContent (this)); } _encrypted = examiner->encrypted (); + _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); _standard = examiner->standard (); _three_d = examiner->three_d (); + _cpl = examiner->cpl (); + } + + if (needed_assets != needs_assets ()) { + signal_changed (DCPContentProperty::NEEDS_ASSETS); + } + + if (needed_kdm != needs_kdm ()) { + signal_changed (DCPContentProperty::NEEDS_KDM); } - if (could_be_played != can_be_played ()) { - signal_changed (DCPContentProperty::CAN_BE_PLAYED); + if (old_name != name ()) { + signal_changed (DCPContentProperty::NAME); } video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); @@ -188,11 +205,11 @@ DCPContent::technical_summary () const } void -DCPContent::as_xml (xmlpp::Node* node) const +DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const { node->add_child("Type")->add_child_text ("DCP"); - Content::as_xml (node); + Content::as_xml (node, with_paths); if (video) { video->as_xml (node); @@ -212,6 +229,7 @@ DCPContent::as_xml (xmlpp::Node* node) 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"); if (_kdm) { node->add_child("KDM")->add_child_text (_kdm->as_xml ()); } @@ -232,6 +250,9 @@ DCPContent::as_xml (xmlpp::Node* node) const } } node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); + if (_cpl) { + node->add_child("CPL")->add_child_text (_cpl.get ()); + } } DCPTime @@ -259,27 +280,36 @@ DCPContent::add_kdm (dcp::EncryptedKDM k) _kdm = k; } +void +DCPContent::add_ov (boost::filesystem::path ov) +{ + read_directory (ov); +} + bool DCPContent::can_be_played () const +{ + return !needs_kdm() && !needs_assets(); +} + +bool +DCPContent::needs_kdm () const { boost::mutex::scoped_lock lm (_mutex); - return !_encrypted || _kdm_valid; + return _encrypted && !_kdm_valid; } -boost::filesystem::path -DCPContent::directory () const +bool +DCPContent::needs_assets () const { - optional smallest; - boost::filesystem::path dir; - for (size_t i = 0; i < number_of_paths(); ++i) { - boost::filesystem::path const p = path (i).parent_path (); - size_t const d = distance (p.begin(), p.end()); - if (!smallest || d < smallest.get ()) { - dir = p; - } - } + boost::mutex::scoped_lock lm (_mutex); + return _needs_assets; +} - return dir; +vector +DCPContent::directories () const +{ + return dcp::DCP::directories_from_files (paths ()); } void @@ -344,11 +374,23 @@ DCPContent::reels () const return p; } - DCPTime from = position (); - BOOST_FOREACH (shared_ptr i, decoder->reels()) { - DCPTime const to = from + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate()); - p.push_back (DCPTimePeriod (from, to)); - from = to; + /* This content's frame rate must be the same as the output DCP rate, so we can + convert `directly' from ContentTime to DCPTime. + */ + + /* The starting point of this content on the timeline */ + DCPTime pos = position() - DCPTime (trim_start().get()); + + BOOST_FOREACH (shared_ptr i, decoder->reels ()) { + /* This reel runs from `pos' to `to' */ + DCPTime const to = pos + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate()); + if (to > position()) { + p.push_back (DCPTimePeriod (max(position(), pos), min(end(), to))); + if (to > end()) { + break; + } + } + pos = to; } return p; @@ -378,7 +420,14 @@ DCPContent::can_reference (function (shared_ptrvideo_frame_rate())) { + why_not.push_back (_("The film has a different frame rate to this DCP.")); + return false; + } + list const fr = film()->reels (); + /* fr must contain reels(). It can also contain other reels, but it must at least contain reels(). */ @@ -401,6 +450,11 @@ DCPContent::can_reference (function (shared_ptr& why_not) const { + if (film()->frame_size() != video->size()) { + why_not.push_back (_("The video frame size in the film differs from that in the DCP.")); + return false; + } + return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not); } @@ -415,7 +469,7 @@ DCPContent::can_reference_audio (list& why_not) const } } - return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not); + return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not); } bool @@ -431,3 +485,21 @@ DCPContent::can_reference_subtitle (list& why_not) const return can_reference (bind (&Content::subtitle, _1), _("There is other subtitle content overlapping this DCP; remove it."), why_not); } + +void +DCPContent::use_template (shared_ptr c) +{ + shared_ptr dc = dynamic_pointer_cast (c); + DCPOMATIC_ASSERT (dc); + + _reference_video = dc->_reference_video; + _reference_audio = dc->_reference_audio; + _reference_subtitle = dc->_reference_subtitle; +} + +void +DCPContent::set_cpl (string id) +{ + boost::mutex::scoped_lock lm (_mutex); + _cpl = id; +}