X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=fd092593514f76401699efcbbfe62b5f55c7817d;hb=e3bb6707618b6a313a490f387bffbf0b6a064643;hp=c180240c886336ecd2bfb4f403b0e58c81913d30;hpb=2169abd0f6d569492122ad699253ab7c792f4969;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index c180240c8..fd0925935 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -54,10 +54,13 @@ 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; +int const DCPContentProperty::HAS_SUBTITLES = 606; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) @@ -118,16 +121,19 @@ 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 DCPContent::read_directory (boost::filesystem::path p) { for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) { - if (boost::filesystem::is_regular_file (i->path ())) { - _paths.push_back (i->path ()); + if (boost::filesystem::is_regular_file (i->path())) { + _paths.push_back (i->path()); } else if (boost::filesystem::is_directory (i->path ())) { - read_directory (i->path ()); + read_directory (i->path()); } } } @@ -135,9 +141,14 @@ 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 (); + bool had_subtitles = static_cast (subtitle); - job->set_progress_unknown (); + if (job) { + job->set_progress_unknown (); + } Content::examine (job); shared_ptr examiner (new DCPExaminer (shared_from_this ())); @@ -156,22 +167,39 @@ DCPContent::examine (shared_ptr job) signal_changed (AudioContentProperty::STREAMS); + bool has_subtitles = false; { boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); if (examiner->has_subtitles ()) { subtitle.reset (new SubtitleContent (this)); + } else { + subtitle.reset (); } + has_subtitles = static_cast (subtitle); _encrypted = examiner->encrypted (); _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); _standard = examiner->standard (); _three_d = examiner->three_d (); _cpl = examiner->cpl (); + _reel_lengths = examiner->reel_lengths (); + } + + if (had_subtitles != has_subtitles) { + signal_changed (DCPContentProperty::HAS_SUBTITLES); + } + + 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); @@ -241,6 +269,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 @@ -297,7 +328,7 @@ DCPContent::needs_assets () const vector DCPContent::directories () const { - return dcp::DCP::directories_from_files (paths ()); + return dcp::DCP::directories_from_files (paths()); } void @@ -351,17 +382,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. */ @@ -369,9 +403,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()) { @@ -416,10 +450,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; @@ -438,28 +480,47 @@ 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); } 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(), false)); + } 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; } } - 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 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(), false)); + } 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; @@ -479,3 +540,10 @@ DCPContent::use_template (shared_ptr c) _reference_audio = dc->_reference_audio; _reference_subtitle = dc->_reference_subtitle; } + +void +DCPContent::set_cpl (string id) +{ + boost::mutex::scoped_lock lm (_mutex); + _cpl = id; +}