X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=ca210b5587ce45cbdd4eee40037649843246f41a;hp=8a2e2050d295547320ca9f4def69aee4eb3fb268;hb=da5e64883d7665353fcf838f6956f2dfb6e8b176;hpb=3c414bf90d4cfcfe342c0b057b5134f72485fe32 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 8a2e2050d..ca210b558 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. @@ -49,12 +49,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; @@ -145,6 +147,16 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) 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 @@ -179,6 +191,7 @@ DCPContent::read_sub_directory (boost::filesystem::path p) } } +/** @param film Film, or 0 */ void DCPContent::examine (shared_ptr film, shared_ptr job) { @@ -191,14 +204,13 @@ DCPContent::examine (shared_ptr film, shared_ptr job) ChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); ChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM); ChangeSignaller cc_name (this, DCPContentProperty::NAME); - ChangeSignaller cc_streams (this, AudioContentProperty::STREAMS); if (job) { job->set_progress_unknown (); } 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()) { { @@ -210,7 +222,6 @@ DCPContent::examine (shared_ptr film, shared_ptr job) } if (examiner->has_audio()) { - ChangeSignaller cc (this, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); audio.reset (new AudioContent (this)); @@ -227,7 +238,7 @@ DCPContent::examine (shared_ptr film, 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))) { + for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { text.push_back (shared_ptr(new TextContent(this, static_cast(i), static_cast(i)))); } } @@ -240,6 +251,12 @@ DCPContent::examine (shared_ptr film, shared_ptr job) _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) { @@ -339,6 +356,19 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const 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 @@ -479,7 +509,7 @@ DCPContent::reels (shared_ptr film) const 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 */ @@ -549,10 +579,10 @@ DCPContent::can_reference (shared_ptr film, function reel_list; try { reel_list = reels (film); - } catch (dcp::DCPReadError) { + } 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; } @@ -580,7 +610,7 @@ DCPContent::can_reference (shared_ptr film, function c) { - return static_cast(c->video); + return static_cast(c->video) && c->video->use(); } bool @@ -591,13 +621,8 @@ DCPContent::can_reference_video (shared_ptr film, string& why_not) c return false; } - 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) { + 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 { @@ -618,7 +643,7 @@ DCPContent::can_reference_video (shared_ptr film, string& why_not) c 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 @@ -626,14 +651,14 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), 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; } @@ -661,12 +686,11 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), 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; } @@ -724,3 +748,15 @@ DCPContent::kdm_timing_window_valid () const 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; +} +