Move upload-DCP-to-TMS button to preferences.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index c70d8b2dbc9172966e400ce8451c9a0ed6168493..d04dacdd6ca573ec7afbf8975b020f2c8d6277ae 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>
@@ -40,6 +41,7 @@
 #include <dcp/subtitle_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 +51,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)
@@ -135,7 +138,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 +163,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 ()) {
@@ -183,14 +186,19 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        _text_count[TEXT_CLOSED_CAPTION]++;
                }
 
+               if (i->main_markers ()) {
+                       map<dcp::Marker, dcp::Time> rm = i->main_markers()->get();
+                       _markers.insert (rm.begin(), rm.end());
+               }
+
                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());
                }
        }
 
@@ -219,7 +227,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                i->main_subtitle()->asset()->subtitles ();
                        }
                }
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
                _kdm_valid = false;
        } catch (dcp::MiscError& e) {
                _kdm_valid = false;
@@ -229,6 +237,8 @@ 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 = list_to_vector (cpl->ratings());
+       _content_version = cpl->content_version_label_text ();
 
        _cpl = cpl->id ();
 }