X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=00ffb390c2c501970e71f20eb6de4cf90493b4c0;hp=b6a66f90ac8423650af4c82fc33381c48bdb43f7;hb=09860271bb6d03b3937c08bffb4c672697f6d711;hpb=24dcab1d4d8d7a28a939c7c4d786197684f155f6 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index b6a66f90a..00ffb390c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ +#include "atmos_content.h" #include "dcp_content.h" #include "video_content.h" #include "audio_content.h" @@ -28,6 +29,8 @@ #include "overlaps.h" #include "compose.hpp" #include "dcp_decoder.h" +#include "log.h" +#include "dcpomatic_log.h" #include "text_content.h" #include #include @@ -47,12 +50,14 @@ using std::distance; using std::pair; using std::vector; using std::list; +using std::map; using boost::shared_ptr; using boost::scoped_ptr; using boost::optional; using boost::function; using boost::dynamic_pointer_cast; using dcp::raw_convert; +using namespace dcpomatic; int const DCPContentProperty::NEEDS_ASSETS = 600; int const DCPContentProperty::NEEDS_KDM = 601; @@ -61,16 +66,18 @@ int const DCPContentProperty::REFERENCE_AUDIO = 603; int const DCPContentProperty::REFERENCE_TEXT = 604; int const DCPContentProperty::NAME = 605; int const DCPContentProperty::TEXTS = 606; +int const DCPContentProperty::CPL = 607; -DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) - : Content (film) - , _encrypted (false) +DCPContent::DCPContent (boost::filesystem::path p) + : _encrypted (false) , _needs_assets (false) , _kdm_valid (false) , _reference_video (false) , _reference_audio (false) , _three_d (false) { + LOG_GENERAL ("Creating DCP content from %1", p.string()); + read_directory (p); set_default_colour_conversion (); @@ -79,12 +86,13 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) } } -DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) - : Content (film, node) +DCPContent::DCPContent (cxml::ConstNodePtr node, int version) + : Content (node) { video = VideoContent::from_xml (this, node, version); audio = AudioContent::from_xml (this, node, version); text = TextContent::from_xml (this, node, version); + atmos = AtmosContent::from_xml (this, node); for (int i = 0; i < TEXT_COUNT; ++i) { _reference_text[i] = false; @@ -132,38 +140,79 @@ 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 ())); } + + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Marker")) { + _markers[dcp::marker_from_string(i->string_attribute("type"))] = ContentTime(raw_convert(i->content())); + } + + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Rating")) { + _ratings.push_back (dcp::Rating(i)); + } + + _content_version = node->optional_string_child("ContentVersion").get_value_or(""); } void DCPContent::read_directory (boost::filesystem::path p) { + read_sub_directory (p); + + 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 +DCPContent::read_sub_directory (boost::filesystem::path p) +{ + LOG_GENERAL ("DCPContent::read_sub_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())) { - _paths.push_back (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 ())) { - read_directory (i->path()); + LOG_GENERAL ("Inside there's directory %1", i->path().string()); + read_sub_directory (i->path()); } } } +/** @param film Film, or 0 */ void -DCPContent::examine (shared_ptr job) +DCPContent::examine (shared_ptr film, shared_ptr job) { bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); string const old_name = name (); int const old_texts = text.size (); + ChangeSignaller cc_texts (this, DCPContentProperty::TEXTS); + ChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); + ChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM); + ChangeSignaller cc_name (this, DCPContentProperty::NAME); + if (job) { job->set_progress_unknown (); } - Content::examine (job); + Content::examine (film, job); - shared_ptr examiner (new DCPExaminer (shared_from_this ())); + shared_ptr examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true)); if (examiner->has_video()) { { @@ -182,9 +231,20 @@ DCPContent::examine (shared_ptr job) AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels())); audio->set_stream (as); AudioMapping m = as->mapping (); - film()->make_audio_mapping_default (m); + m.make_default (film ? film->audio_processor() : 0); as->set_mapping (m); - signal_changed (AudioContentProperty::STREAMS); + } + + if (examiner->has_atmos()) { + { + boost::mutex::scoped_lock lm (_mutex); + atmos.reset (new AtmosContent(this)); + } + /* Setting length will cause calculations to be made based on edit rate, so that must + * be set up first otherwise hard-to-spot exceptions will be thrown. + */ + atmos->set_edit_rate (examiner->atmos_edit_rate()); + atmos->set_length (examiner->atmos_length()); } int texts = 0; @@ -192,8 +252,12 @@ DCPContent::examine (shared_ptr job) boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); for (int i = 0; i < TEXT_COUNT; ++i) { - if (examiner->has_text(static_cast(i))) { - text.push_back (shared_ptr(new TextContent(this, static_cast(i), static_cast(i)))); + for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { + shared_ptr c(new TextContent(this, static_cast(i), static_cast(i))); + if (i == TEXT_CLOSED_CAPTION) { + c->set_dcp_track (examiner->dcp_text_track(j)); + } + text.push_back (c); } } texts = text.size (); @@ -202,28 +266,33 @@ 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 (); + map markers = examiner->markers(); + for (map::const_iterator i = markers.begin(); i != markers.end(); ++i) { + _markers[i->first] = ContentTime(i->second.as_editable_units(DCPTime::HZ)); + } + _ratings = examiner->ratings (); + _content_version = examiner->content_version (); } - if (old_texts != texts) { - signal_changed (DCPContentProperty::TEXTS); + if (old_texts == texts) { + cc_texts.abort (); } - if (needed_assets != needs_assets ()) { - signal_changed (DCPContentProperty::NEEDS_ASSETS); + if (needed_assets == needs_assets()) { + cc_assets.abort (); } - if (needed_kdm != needs_kdm ()) { - signal_changed (DCPContentProperty::NEEDS_KDM); + if (needed_kdm == needs_kdm()) { + cc_kdm.abort (); } - if (old_name != name ()) { - signal_changed (DCPContentProperty::NAME); + if (old_name == name()) { + cc_name.abort (); } - signal_changed (AudioContentProperty::STREAMS); - if (video) { video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); } @@ -271,6 +340,10 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const i->as_xml (node); } + if (atmos) { + atmos->as_xml (node); + } + boost::mutex::scoped_lock lm (_mutex); node->add_child("Name")->add_child_text (_name); node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); @@ -296,22 +369,47 @@ 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 ()); } BOOST_FOREACH (int64_t i, _reel_lengths) { node->add_child("ReelLength")->add_child_text (raw_convert (i)); } + + for (map::const_iterator i = _markers.begin(); i != _markers.end(); ++i) { + xmlpp::Element* marker = node->add_child("Marker"); + marker->set_attribute("type", dcp::marker_to_string(i->first)); + marker->add_child_text(raw_convert(i->second.get())); + } + + BOOST_FOREACH (dcp::Rating i, _ratings) { + xmlpp::Element* rating = node->add_child("Rating"); + i.as_xml (rating); + } + + node->add_child("ContentVersion")->add_child_text (_content_version); +} + +DCPTime +DCPContent::full_length (shared_ptr film) const +{ + if (!video) { + return DCPTime(); + } + FrameRateChange const frc (film, shared_from_this()); + return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate()); } DCPTime -DCPContent::full_length () const +DCPContent::approximate_length () const { if (!video) { return DCPTime(); } - FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ()); - return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ()); + return DCPTime::from_frames (video->length(), 24); } string @@ -373,14 +471,14 @@ DCPContent::directories () const } void -DCPContent::add_properties (list& p) const +DCPContent::add_properties (shared_ptr film, list& p) const { - Content::add_properties (p); + Content::add_properties (film, p); if (video) { video->add_properties (p); } if (audio) { - audio->add_properties (p); + audio->add_properties (film, p); } } @@ -396,48 +494,48 @@ DCPContent::set_default_colour_conversion () void DCPContent::set_reference_video (bool r) { + ChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO); + { boost::mutex::scoped_lock lm (_mutex); _reference_video = r; } - - signal_changed (DCPContentProperty::REFERENCE_VIDEO); } void DCPContent::set_reference_audio (bool r) { + ChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO); + { boost::mutex::scoped_lock lm (_mutex); _reference_audio = r; } - - signal_changed (DCPContentProperty::REFERENCE_AUDIO); } void DCPContent::set_reference_text (TextType type, bool r) { + ChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT); + { boost::mutex::scoped_lock lm (_mutex); _reference_text[type] = r; } - - signal_changed (DCPContentProperty::REFERENCE_TEXT); } list -DCPContent::reels () const +DCPContent::reels (shared_ptr film) const { 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())); + scoped_ptr examiner (new DCPExaminer(shared_from_this(), film->tolerant())); 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 ())); + reel_lengths.push_back (length_after_trim(film).frames_round(film->video_frame_rate())); } } @@ -452,10 +550,10 @@ DCPContent::reels () const BOOST_FOREACH (int64_t i, reel_lengths) { /* This reel runs from `pos' to `to' */ - DCPTime const to = pos + DCPTime::from_frames (i, 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()) { + p.push_back (DCPTimePeriod (max(position(), pos), min(end(film), to))); + if (to > end(film)) { break; } } @@ -466,25 +564,25 @@ DCPContent::reels () const } list -DCPContent::reel_split_points () const +DCPContent::reel_split_points (shared_ptr film) const { list s; - BOOST_FOREACH (DCPTimePeriod i, reels()) { + BOOST_FOREACH (DCPTimePeriod i, reels(film)) { s.push_back (i.from); } return s; } bool -DCPContent::can_reference (function)> part, string overlapping, string& why_not) const +DCPContent::can_reference (shared_ptr film, function)> part, string overlapping, string& why_not) const { /* We must be using the same standard as the film */ if (_standard) { - if (_standard.get() == dcp::INTEROP && !film()->interop()) { + if (_standard.get() == dcp::INTEROP && !film->interop()) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("it is Interop and the film is set to SMPTE."); return false; - } else if (_standard.get() == dcp::SMPTE && film()->interop()) { + } else if (_standard.get() == dcp::SMPTE && film->interop()) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("it is SMPTE and the film is set to Interop."); return false; @@ -492,21 +590,21 @@ DCPContent::can_reference (function)> part, stri } /* And the same frame rate */ - if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film()->video_frame_rate())) { + if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film->video_frame_rate())) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("it has a different frame rate to the film."); return false; } - list const fr = film()->reels (); + list const fr = film->reels (); list reel_list; try { - reel_list = reels (); - } catch (dcp::DCPReadError) { + reel_list = reels (film); + } catch (dcp::ReadError &) { /* We couldn't read the DCP; it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } @@ -522,7 +620,7 @@ DCPContent::can_reference (function)> part, stri } } - ContentList a = overlaps (film()->content(), part, position(), end()); + ContentList a = overlaps (film, film->content(), part, position(), end(film)); if (a.size() != 1 || a.front().get() != this) { why_not = overlapping; return false; @@ -534,46 +632,55 @@ DCPContent::can_reference (function)> part, stri static bool check_video (shared_ptr c) { - return static_cast(c->video); + return static_cast(c->video) && c->video->use(); } bool -DCPContent::can_reference_video (string& why_not) const +DCPContent::can_reference_video (shared_ptr film, string& why_not) const { if (!video) { why_not = _("There is no video in this DCP"); return false; } - if (film()->frame_size() != video->size()) { + if (film->resolution() != resolution()) { + if (resolution() == 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; } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not); + return can_reference (film, bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not); } static bool check_audio (shared_ptr c) { - return static_cast(c->audio); + return static_cast(c->audio) && !c->audio->mapping().mapped_output_channels().empty(); } bool -DCPContent::can_reference_audio (string& why_not) const +DCPContent::can_reference_audio (shared_ptr film, string& why_not) const { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false)); - } catch (dcp::DCPReadError) { + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); + } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (DCPError) { + } catch (DCPError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } @@ -587,7 +694,7 @@ DCPContent::can_reference_audio (string& why_not) const } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not); + return can_reference (film, bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not); } static @@ -595,16 +702,17 @@ bool check_text (shared_ptr c) { return !c->text.empty(); } + bool -DCPContent::can_reference_text (TextType type, string& why_not) const +DCPContent::can_reference_text (shared_ptr film, TextType type, string& why_not) const { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false)); - } catch (dcp::DCPReadError) { + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); + } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } @@ -615,7 +723,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; @@ -623,7 +731,7 @@ DCPContent::can_reference_text (TextType type, string& why_not) const } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); + return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); } void @@ -644,6 +752,33 @@ DCPContent::take_settings_from (shared_ptr c) void DCPContent::set_cpl (string id) { - boost::mutex::scoped_lock lm (_mutex); - _cpl = id; + ChangeSignaller cc (this, DCPContentProperty::CPL); + + { + boost::mutex::scoped_lock lm (_mutex); + _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(); +} + + +Resolution +DCPContent::resolution () const +{ + if (video->size().width > 2048 || video->size().height > 1080) { + return RESOLUTION_4K; + } + + return RESOLUTION_2K; +} +