Fix a couple more crashes with incorrect KDMs (#1000).

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 8c1b2d8a1994e9019196f51b84014b21b8a8bcaf..a6424874adb6978d488693c542fb4122d0206da6 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -60,6 +60,7 @@ 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<const Film> film, boost::filesystem::path p)
        : Content (film)
@@ -120,16 +121,19 @@ DCPContent::DCPContent (shared_ptr<const Film> 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<int64_t> (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());
                }
        }
 }
@@ -140,8 +144,11 @@ DCPContent::examine (shared_ptr<Job> job)
        bool const needed_assets = needs_assets ();
        bool const needed_kdm = needs_kdm ();
        string const old_name = name ();
+       bool had_subtitles = static_cast<bool> (subtitle);
 
-       job->set_progress_unknown ();
+       if (job) {
+               job->set_progress_unknown ();
+       }
        Content::examine (job);
 
        shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
@@ -160,18 +167,27 @@ DCPContent::examine (shared_ptr<Job> 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<bool> (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 ()) {
@@ -253,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<string> (i));
+       }
 }
 
 DCPTime
@@ -309,7 +328,7 @@ DCPContent::needs_assets () const
 vector<boost::filesystem::path>
 DCPContent::directories () const
 {
-       return dcp::DCP::directories_from_files (paths ());
+       return dcp::DCP::directories_from_files (paths());
 }
 
 void
@@ -363,17 +382,20 @@ DCPContent::set_reference_subtitle (bool r)
 list<DCPTimePeriod>
 DCPContent::reels () const
 {
-       list<DCPTimePeriod> p;
-       scoped_ptr<DCPDecoder> decoder;
-       try {
-               decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
-       } catch (...) {
-               /* Could not load the DCP; guess reels */
-               list<DCPTimePeriod> p;
-               p.push_back (DCPTimePeriod (position(), end()));
-               return p;
+       list<int64_t> reel_lengths = _reel_lengths;
+       if (reel_lengths.empty ()) {
+               /* Old metadata with no reel lengths; get them here instead */
+               try {
+                       scoped_ptr<DCPExaminer> 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<DCPTimePeriod> p;
+
        /* This content's frame rate must be the same as the output DCP rate, so we can
           convert `directly' from ContentTime to DCPTime.
        */
@@ -381,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<dcp::Reel> 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()) {
@@ -434,6 +456,9 @@ DCPContent::can_reference (function<shared_ptr<ContentPart> (shared_ptr<const Co
        } catch (dcp::DCPReadError) {
                /* We couldn't read the DCP; it's probably missing */
                return false;
+       } catch (dcp::KDMDecryptionError) {
+               /* We have an incorrect KDM */
+               return false;
        }
 
        /* fr must contain reels().  It can also contain other reels, but it must at
@@ -471,10 +496,13 @@ DCPContent::can_reference_audio (list<string>& why_not) const
 {
        shared_ptr<DCPDecoder> decoder;
        try {
-               decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
+               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;
+       } catch (dcp::KDMDecryptionError) {
+               /* We have an incorrect KDM */
+               return false;
        }
 
         BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
@@ -492,10 +520,13 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const
 {
        shared_ptr<DCPDecoder> decoder;
        try {
-               decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
+               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;
+       } catch (dcp::KDMDecryptionError) {
+               /* We have an incorrect KDM */
+               return false;
        }
 
         BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
@@ -509,7 +540,7 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const
 }
 
 void
-DCPContent::use_template (shared_ptr<const Content> c)
+DCPContent::take_settings_from (shared_ptr<const Content> c)
 {
        shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
        DCPOMATIC_ASSERT (dc);