Remove our forcing of analyzeduration and probesize as they seem to

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1785669dd56ceefdf93f33cbf29465ea49eaad1c..8866ba7219aa4ee00b2783f7466f1f66f13d45b5 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -52,8 +52,8 @@ using std::runtime_error;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
-       : DCP (content)
+DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
+       : DCP (content, tolerant)
        , _video_length (0)
        , _audio_length (0)
        , _has_video (false)
@@ -66,7 +66,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        shared_ptr<dcp::CPL> cpl;
 
        for (int i = 0; i < TEXT_COUNT; ++i) {
-               _has_text[i] = false;
+               _text_count[i] = 0;
        }
 
        if (content->cpl ()) {
@@ -108,6 +108,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
        _cpl = cpl->id ();
        _name = cpl->content_title_text ();
+       _content_kind = cpl->content_kind ();
 
        BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
 
@@ -134,7 +135,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                throw DCPError (_("Mismatched video sizes in DCP"));
                        }
 
-                       _video_length += i->main_picture()->duration();
+                       _video_length += i->main_picture()->actual_duration();
                }
 
                if (i->main_sound ()) {
@@ -159,7 +160,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                throw DCPError (_("Mismatched audio sample rates in DCP"));
                        }
 
-                       _audio_length += i->main_sound()->duration();
+                       _audio_length += i->main_sound()->actual_duration();
                }
 
                if (i->main_subtitle ()) {
@@ -169,7 +170,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       _has_text[TEXT_OPEN_SUBTITLE] = true;
+                       _text_count[TEXT_OPEN_SUBTITLE] = 1;
                }
 
                BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> j, i->closed_captions()) {
@@ -179,17 +180,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       _has_text[TEXT_CLOSED_CAPTION] = true;
+                       _text_count[TEXT_CLOSED_CAPTION]++;
                }
 
                if (i->main_picture()) {
-                       _reel_lengths.push_back (i->main_picture()->duration());
+                       _reel_lengths.push_back (i->main_picture()->actual_duration());
                } else if (i->main_sound()) {
-                       _reel_lengths.push_back (i->main_sound()->duration());
+                       _reel_lengths.push_back (i->main_sound()->actual_duration());
                } else if (i->main_subtitle()) {
-                       _reel_lengths.push_back (i->main_subtitle()->duration());
+                       _reel_lengths.push_back (i->main_subtitle()->actual_duration());
                } else if (!i->closed_captions().empty()) {
-                       _reel_lengths.push_back (i->closed_captions().front()->duration());
+                       _reel_lengths.push_back (i->closed_captions().front()->actual_duration());
                }
        }