X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=2eead3ee00d38be0212c411a7c695bfab771a0a5;hb=9f034b0e2b39c2c56b767371af90deb888d8779f;hp=0d36118e716adbd720bedfb46655a34476d70dcb;hpb=0ac8235fa4addb021c0e05a9c6c19a7d22097458;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 0d36118e7..2eead3ee0 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -59,6 +59,7 @@ 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) @@ -119,6 +120,9 @@ 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"); + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) { + _reel_lengths.push_back (raw_convert (i->content ())); + } } void @@ -138,6 +142,7 @@ DCPContent::examine (shared_ptr job) { bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); + string const old_name = name (); job->set_progress_unknown (); Content::examine (job); @@ -170,6 +175,7 @@ DCPContent::examine (shared_ptr job) _standard = examiner->standard (); _three_d = examiner->three_d (); _cpl = examiner->cpl (); + _reel_lengths = examiner->reel_lengths (); } if (needed_assets != needs_assets ()) { @@ -180,6 +186,10 @@ DCPContent::examine (shared_ptr job) signal_changed (DCPContentProperty::NEEDS_KDM); } + if (old_name != name ()) { + signal_changed (DCPContentProperty::NAME); + } + video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); } @@ -247,6 +257,9 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const if (_cpl) { node->add_child("CPL")->add_child_text (_cpl.get ()); } + BOOST_FOREACH (int64_t i, _reel_lengths) { + node->add_child("ReelLength")->add_child_text (raw_convert (i)); + } } DCPTime @@ -357,17 +370,20 @@ DCPContent::set_reference_subtitle (bool r) list DCPContent::reels () const { - list p; - scoped_ptr decoder; - try { - decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); - } catch (...) { - /* Could not load the DCP; guess reels */ - list p; - p.push_back (DCPTimePeriod (position(), end())); - return p; + list reel_lengths = _reel_lengths; + if (reel_lengths.empty ()) { + /* Old metadata with no reel lengths; get them here instead */ + try { + scoped_ptr examiner (new DCPExaminer (shared_from_this())); + reel_lengths = examiner->reel_lengths (); + } catch (...) { + /* Could not examine the DCP; guess reels */ + reel_lengths.push_back (length_after_trim().frames_round (film()->video_frame_rate ())); + } } + list p; + /* This content's frame rate must be the same as the output DCP rate, so we can convert `directly' from ContentTime to DCPTime. */ @@ -375,9 +391,9 @@ DCPContent::reels () const /* The starting point of this content on the timeline */ DCPTime pos = position() - DCPTime (trim_start().get()); - BOOST_FOREACH (shared_ptr i, decoder->reels ()) { + BOOST_FOREACH (int64_t i, reel_lengths) { /* This reel runs from `pos' to `to' */ - DCPTime const to = pos + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate()); + DCPTime const to = pos + DCPTime::from_frames (i, film()->video_frame_rate()); if (to > position()) { p.push_back (DCPTimePeriod (max(position(), pos), min(end(), to))); if (to > end()) { @@ -422,10 +438,18 @@ DCPContent::can_reference (function (shared_ptr const fr = film()->reels (); + list reel_list; + try { + reel_list = reels (); + } catch (dcp::DCPReadError) { + /* We couldn't read the DCP; it's probably missing */ + return false; + } + /* fr must contain reels(). It can also contain other reels, but it must at least contain reels(). */ - BOOST_FOREACH (DCPTimePeriod i, reels()) { + BOOST_FOREACH (DCPTimePeriod i, reel_list) { if (find (fr.begin(), fr.end(), i) == fr.end ()) { why_not.push_back (_("The reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'.")); return false; @@ -455,8 +479,15 @@ DCPContent::can_reference_video (list& why_not) const bool DCPContent::can_reference_audio (list& why_not) const { - DCPDecoder decoder (shared_from_this(), film()->log()); - BOOST_FOREACH (shared_ptr i, decoder.reels()) { + shared_ptr decoder; + try { + decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); + } catch (dcp::DCPReadError) { + /* We couldn't read the DCP, so it's probably missing */ + return false; + } + + BOOST_FOREACH (shared_ptr i, decoder->reels()) { if (!i->main_sound()) { why_not.push_back (_("The DCP does not have sound in all reels.")); return false; @@ -469,8 +500,15 @@ DCPContent::can_reference_audio (list& why_not) const bool DCPContent::can_reference_subtitle (list& why_not) const { - DCPDecoder decoder (shared_from_this(), film()->log()); - BOOST_FOREACH (shared_ptr i, decoder.reels()) { + shared_ptr decoder; + try { + decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); + } catch (dcp::DCPReadError) { + /* We couldn't read the DCP, so it's probably missing */ + return false; + } + + BOOST_FOREACH (shared_ptr i, decoder->reels()) { if (!i->main_subtitle()) { why_not.push_back (_("The DCP does not have subtitles in all reels.")); return false;