Stop crashing when running the hints check on films with silent/black gaps.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index c70d8b2dbc9172966e400ce8451c9a0ed6168493..8866ba7219aa4ee00b2783f7466f1f66f13d45b5 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -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)
@@ -135,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 ()) {
@@ -160,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 ()) {
@@ -184,13 +184,13 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                }
 
                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());
                }
        }