Fixes for new libdcp with multiple content versions.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index c70d8b2dbc9172966e400ce8451c9a0ed6168493..27eb74a5d5231e559cc5856ff78040d105e8c786 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,7 @@
 #include "exceptions.h"
 #include "image.h"
 #include "config.h"
+#include "util.h"
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
@@ -38,8 +39,10 @@
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_asset.h>
+#include <dcp/reel_atmos_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
+#include <dcp/reel_markers_asset.h>
 #include <dcp/sound_asset.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -49,11 +52,12 @@
 using std::list;
 using std::cout;
 using std::runtime_error;
+using std::map;
 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)
@@ -62,6 +66,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _needs_assets (false)
        , _kdm_valid (false)
        , _three_d (false)
+       , _has_atmos (false)
+       , _atmos_length (0)
 {
        shared_ptr<dcp::CPL> cpl;
 
@@ -93,6 +99,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                if (j->main_subtitle() && !j->main_subtitle()->asset_ref().resolved()) {
                                        ++unsatisfied;
                                }
+                               if (j->atmos() && !j->atmos()->asset_ref().resolved()) {
+                                       ++unsatisfied;
+                               }
                        }
 
                        if (unsatisfied < least_unsatisfied) {
@@ -135,7 +144,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 +169,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 ()) {
@@ -181,16 +190,33 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        }
 
                        _text_count[TEXT_CLOSED_CAPTION]++;
+                       _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown"))));
+               }
+
+               if (i->main_markers ()) {
+                       map<dcp::Marker, dcp::Time> rm = i->main_markers()->get();
+                       _markers.insert (rm.begin(), rm.end());
+               }
+
+               if (i->atmos()) {
+                       _has_atmos = true;
+                       _atmos_length += i->atmos()->actual_duration();
+                       if (_atmos_edit_rate != dcp::Fraction()) {
+                               DCPOMATIC_ASSERT (i->atmos()->edit_rate() == _atmos_edit_rate);
+                       }
+                       _atmos_edit_rate = i->atmos()->edit_rate();
                }
 
                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());
+               } else if (!i->atmos()) {
+                       _reel_lengths.push_back (i->atmos()->actual_duration());
                }
        }
 
@@ -218,8 +244,12 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        if (i->main_subtitle()) {
                                i->main_subtitle()->asset()->subtitles ();
                        }
+
+                       if (i->atmos()) {
+                               i->atmos()->asset()->start_read()->get_frame(0);
+                       }
                }
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
                _kdm_valid = false;
        } catch (dcp::MiscError& e) {
                _kdm_valid = false;
@@ -229,6 +259,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        _standard = cpl->standard().get();
        _three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() &&
                dynamic_pointer_cast<dcp::StereoPictureAsset> (cpl->reels().front()->main_picture()->asset());
+       _ratings = cpl->ratings();
+       BOOST_FOREACH (dcp::ContentVersion i, cpl->content_versions()) {
+               _content_versions.push_back (i.label_text);
+       }
 
        _cpl = cpl->id ();
 }