DCPExaminer must find Atmos length / edit rate.

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 133c1614e922b5b5f8b6efbcb8a88d7321c2d785..b05ef593b7e538735f1067119db13ff23b26ed14 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -67,6 +67,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        , _kdm_valid (false)
        , _three_d (false)
        , _has_atmos (false)
+       , _atmos_length (0)
 {
        shared_ptr<dcp::CPL> cpl;
 
@@ -198,6 +199,11 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
                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()) {

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index b4c87596c70e354079937132d289a06ed2ba8a42..78d2befd3b3115631d81290f714ed858c6a64809 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -135,6 +135,14 @@ public:
                return _has_atmos;
        }
 
+       Frame atmos_length () const {
+               return _atmos_length;
+       }
+
+       dcp::Fraction atmos_edit_rate () const {
+               return _atmos_edit_rate;
+       }
+
 private:
        boost::optional<double> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
@@ -161,4 +169,6 @@ private:
        std::vector<dcp::Rating> _ratings;
        std::string _content_version;
        bool _has_atmos;
+       Frame _atmos_length;
+       dcp::Fraction _atmos_edit_rate;
 };