Fix enabled/disable overlapping video/audio with DCP content (part of #1355)

[dcpomatic.git] / src / lib / dcp_content.cc

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index d0f434e5a87af1e0b0da304ca73c136620c7623e..ca210b5587ce45cbdd4eee40037649843246f41a 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -49,6 +49,7 @@ 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;
@@ -146,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<int64_t> (i->content ()));
        }
+
+       BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Marker")) {
+               _markers[dcp::marker_from_string(i->string_attribute("type"))] = ContentTime(raw_convert<int64_t>(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
@@ -240,6 +251,12 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                _content_kind = examiner->content_kind ();
                _cpl = examiner->cpl ();
                _reel_lengths = examiner->reel_lengths ();
+               map<dcp::Marker, dcp::Time> markers = examiner->markers();
+               for (map<dcp::Marker, dcp::Time>::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<string> (i));
        }
+
+       for (map<dcp::Marker, ContentTime>::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<string>(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
@@ -549,7 +579,7 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
        list<DCPTimePeriod> 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 &) {
@@ -580,7 +610,7 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
 static
 bool check_video (shared_ptr<const Content> c)
 {
-       return static_cast<bool>(c->video);
+       return static_cast<bool>(c->video) && c->video->use();
 }
 
 bool
@@ -591,13 +621,8 @@ DCPContent::can_reference_video (shared_ptr<const Film> 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<const Film> film, string& why_not) c
 static
 bool check_audio (shared_ptr<const Content> c)
 {
-       return static_cast<bool>(c->audio);
+       return static_cast<bool>(c->audio) && !c->audio->mapping().mapped_output_channels().empty();
 }
 
 bool
@@ -627,7 +652,7 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
        shared_ptr<DCPDecoder> decoder;
        try {
                decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
-       } catch (dcp::DCPReadError &) {
+       } catch (dcp::ReadError &) {
                /* We couldn't read the DCP, so it's probably missing */
                return false;
        } catch (DCPError &) {
@@ -662,7 +687,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
        shared_ptr<DCPDecoder> decoder;
        try {
                decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
-       } catch (dcp::DCPReadError &) {
+       } catch (dcp::ReadError &) {
                /* We couldn't read the DCP, so it's probably missing */
                return false;
        } catch (dcp::KDMDecryptionError &) {
@@ -723,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;
+}
+