More player debugging for butler video-full states.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 9969245305211b901a4ec66db317af6d53143c51..dfb47f2ebf6d1f009e9476620e4c708ea84591c4 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -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>
@@ -55,7 +56,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        : DCP (content)
        , _video_length (0)
        , _audio_length (0)
-       , _has_subtitles (false)
+       , _has_video (false)
+       , _has_audio (false)
        , _encrypted (false)
        , _needs_assets (false)
        , _kdm_valid (false)
@@ -63,6 +65,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 {
        shared_ptr<dcp::CPL> cpl;
 
+       for (int i = 0; i < TEXT_COUNT; ++i) {
+               _has_text[i] = false;
+       }
+
        if (content->cpl ()) {
                /* Use the CPL that the content was using before */
                BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
@@ -102,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()) {
 
@@ -120,6 +127,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                throw DCPError (_("Mismatched frame rates in DCP"));
                        }
 
+                       _has_video = true;
                        shared_ptr<dcp::PictureAsset> asset = i->main_picture()->asset ();
                        if (!_video_size) {
                                _video_size = asset->size ();
@@ -137,6 +145,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
+                       _has_audio = true;
                        shared_ptr<dcp::SoundAsset> asset = i->main_sound()->asset ();
 
                        if (!_audio_channels) {
@@ -161,7 +170,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       _has_subtitles = true;
+                       _has_text[TEXT_OPEN_SUBTITLE] = true;
+               }
+
+               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;
+                       }
+
+                       _has_text[TEXT_CLOSED_CAPTION] = true;
                }
 
                if (i->main_picture()) {
@@ -170,6 +189,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        _reel_lengths.push_back (i->main_sound()->duration());
                } else if (i->main_subtitle()) {
                        _reel_lengths.push_back (i->main_subtitle()->duration());
+               } else if (!i->closed_captions().empty()) {
+                       _reel_lengths.push_back (i->closed_captions().front()->duration());
                }
        }
 
@@ -200,6 +221,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                }
        } catch (dcp::DCPReadError& e) {
                _kdm_valid = false;
+       } catch (dcp::MiscError& e) {
+               _kdm_valid = false;
        }
 
        DCPOMATIC_ASSERT (cpl->standard ());