C++11 tidying.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index ca851db2d941d3dda1cdaacce36b3f2f603f165a..e290a966a9b4f58e3c115bea9bed222153d91200 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "dcp_examiner.h"
 #include "dcp_content.h"
 #include "exceptions.h"
@@ -48,12 +49,13 @@
 
 #include "i18n.h"
 
-using std::list;
+
 using std::cout;
-using std::runtime_error;
-using std::map;
-using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::string;
+using boost::optional;
+
 
 DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        : DCP (content, tolerant)
@@ -108,6 +110,15 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        _name = cpl->content_title_text ();
        _content_kind = cpl->content_kind ();
 
+       auto try_to_parse_language = [](optional<string> lang) -> boost::optional<dcp::LanguageTag> {
+               try {
+                       if (lang) {
+                               return dcp::LanguageTag (*lang);
+                       }
+               } catch (...) {}
+               return boost::none;
+       };
+
        for (auto i: cpl->reels()) {
 
                if (i->main_picture ()) {
@@ -159,6 +170,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        }
 
                        _audio_length += i->main_sound()->actual_duration();
+                       _audio_language = try_to_parse_language (asset->language());
                }
 
                if (i->main_subtitle ()) {
@@ -169,6 +181,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        }
 
                        _text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
+                       _open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
                }
 
                for (auto j: i->closed_captions()) {
@@ -179,11 +192,11 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        }
 
                        _text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
-                       _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown"))));
+                       _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), try_to_parse_language(j->language())));
                }
 
                if (i->main_markers ()) {
-                       map<dcp::Marker, dcp::Time> rm = i->main_markers()->get();
+                       auto rm = i->main_markers()->get();
                        _markers.insert (rm.begin(), rm.end());
                }
 
@@ -227,9 +240,13 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset>(pic);
 
                        if (mono) {
-                               mono->start_read()->get_frame(0)->xyz_image ();
+                               auto reader = mono->start_read();
+                               reader->set_check_hmac (false);
+                               reader->get_frame(0)->xyz_image();
                        } else {
-                               stereo->start_read()->get_frame(0)->xyz_image(dcp::Eye::LEFT);
+                               auto reader = stereo->start_read();
+                               reader->set_check_hmac (false);
+                               reader->get_frame(0)->xyz_image(dcp::Eye::LEFT);
                        }
 
                        if (i->main_sound()) {
@@ -237,7 +254,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                if (sound->encrypted() && !sound->key()) {
                                        _kdm_valid = false;
                                }
-                               i->main_sound()->asset()->start_read()->get_frame(0);
+                               auto reader = i->main_sound()->asset()->start_read();
+                               reader->set_check_hmac (false);
+                               reader->get_frame(0);
                        }
 
                        if (i->main_subtitle()) {
@@ -254,7 +273,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                if (atmos->encrypted() && !atmos->key()) {
                                        _kdm_valid = false;
                                }
-                               atmos->start_read()->get_frame(0);
+                               auto reader = atmos->start_read();
+                               reader->set_check_hmac (false);
+                               reader->get_frame(0);
                        }
                }
        } catch (dcp::ReadError& e) {
@@ -263,8 +284,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                _kdm_valid = false;
        }
 
-       DCPOMATIC_ASSERT (cpl->standard ());
-       _standard = cpl->standard().get();
+       _standard = cpl->standard();
        _three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() &&
                dynamic_pointer_cast<dcp::StereoPictureAsset> (cpl->reels().front()->main_picture()->asset());
        _ratings = cpl->ratings();