Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index c097877a33816f02760491796598a1088793f1e1..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.
 
@@ -39,6 +39,7 @@
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_asset.h>
 #include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <dcp/sound_asset.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -51,13 +52,12 @@ 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)
        , _has_audio (false)
-       , _has_subtitles (false)
        , _encrypted (false)
        , _needs_assets (false)
        , _kdm_valid (false)
@@ -65,6 +65,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 {
        shared_ptr<dcp::CPL> cpl;
 
+       for (int i = 0; i < TEXT_COUNT; ++i) {
+               _text_count[i] = 0;
+       }
+
        if (content->cpl ()) {
                /* Use the CPL that the content was using before */
                BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
@@ -104,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()) {
 
@@ -130,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 ()) {
@@ -155,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 ()) {
@@ -165,15 +170,27 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       _has_subtitles = true;
+                       _text_count[TEXT_OPEN_SUBTITLE] = 1;
+               }
+
+               BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> j, i->closed_captions()) {
+                       if (!j->asset_ref().resolved()) {
+                               /* We are missing this asset so we can't continue; examination will be repeated later */
+                               _needs_assets = true;
+                               return;
+                       }
+
+                       _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()->actual_duration());
                }
        }