X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=b431cec26b94a3fc13d0504a2ff6e4329c949a3a;hb=b249700e1da7dd6631a8b4440587f4093a2bdef1;hp=a7d451eca75e14d326ea82d527a5e090b30e1782;hpb=736745c86cefc6d5d4d8098799efc86f0f639061;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index a7d451eca..b431cec26 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -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,11 +39,11 @@
 #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>
 
 #include "i18n.h"
@@ -51,29 +52,24 @@ using std::list;
 using std::cout;
 using std::runtime_error;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::string;
+using std::dynamic_pointer_cast;
+using boost::optional;
+
 
 DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	: DCP (content, tolerant)
-	, _video_length (0)
-	, _audio_length (0)
-	, _has_video (false)
-	, _has_audio (false)
-	, _encrypted (false)
-	, _needs_assets (false)
-	, _kdm_valid (false)
-	, _three_d (false)
 {
 	shared_ptr<dcp::CPL> cpl;
 
-	for (int i = 0; i < TEXT_COUNT; ++i) {
+	for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
 		_text_count[i] = 0;
 	}
 
 	if (content->cpl ()) {
 		/* Use the CPL that the content was using before */
-		BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
+		for (auto i: cpls()) {
 			if (i->id() == content->cpl().get()) {
 				cpl = i;
 			}
@@ -83,9 +79,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
 		int least_unsatisfied = INT_MAX;
 
-		BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
+		for (auto i: cpls()) {
 			int unsatisfied = 0;
-			BOOST_FOREACH (shared_ptr<dcp::Reel> j, i->reels()) {
+			for (auto j: i->reels()) {
 				if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) {
 					++unsatisfied;
 				}
@@ -95,6 +91,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				if (j->main_subtitle() && !j->main_subtitle()->asset_ref().resolved()) {
 					++unsatisfied;
 				}
+				if (j->atmos() && !j->atmos()->asset_ref().resolved()) {
+					++unsatisfied;
+				}
 			}
 
 			if (unsatisfied < least_unsatisfied) {
@@ -112,7 +111,16 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	_name = cpl->content_title_text ();
 	_content_kind = cpl->content_kind ();
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+	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 ()) {
 			if (!i->main_picture()->asset_ref().resolved()) {
@@ -121,7 +129,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				return;
 			}
 
-			dcp::Fraction const frac = i->main_picture()->edit_rate ();
+			auto const frac = i->main_picture()->edit_rate ();
 			float const fr = float(frac.numerator) / frac.denominator;
 			if (!_video_frame_rate) {
 				_video_frame_rate = fr;
@@ -130,7 +138,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			}
 
 			_has_video = true;
-			shared_ptr<dcp::PictureAsset> asset = i->main_picture()->asset ();
+			auto asset = i->main_picture()->asset();
 			if (!_video_size) {
 				_video_size = asset->size ();
 			} else if (_video_size.get() != asset->size ()) {
@@ -148,7 +156,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			}
 
 			_has_audio = true;
-			shared_ptr<dcp::SoundAsset> asset = i->main_sound()->asset ();
+			auto asset = i->main_sound()->asset();
 
 			if (!_audio_channels) {
 				_audio_channels = asset->channels ();
@@ -163,6 +171,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 ()) {
@@ -172,24 +181,35 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				return;
 			}
 
-			_text_count[TEXT_OPEN_SUBTITLE] = 1;
+			_text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
+			_open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
 		}
 
-		BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> j, i->closed_captions()) {
+		for (auto 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;
 			}
 
-			_text_count[TEXT_CLOSED_CAPTION]++;
+			_text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
+			_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());
 		}
 
+		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()->actual_duration());
 		} else if (i->main_sound()) {
@@ -198,32 +218,57 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			_reel_lengths.push_back (i->main_subtitle()->actual_duration());
 		} else if (!i->closed_captions().empty()) {
 			_reel_lengths.push_back (i->closed_captions().front()->actual_duration());
+		} else if (!i->atmos()) {
+			_reel_lengths.push_back (i->atmos()->actual_duration());
 		}
 	}
 
-	_encrypted = cpl->encrypted ();
+	_encrypted = cpl->any_encrypted ();
 	_kdm_valid = true;
 
-	/* Check that we can read the first picture, sound and subtitle frames of each reel */
+	/* Check first that anything encrypted has a key.  We must do this, as if we try to
+	 * read encrypted data with asdcplib without even offering a key it will just return
+	 * the encrypted data.  Secondly, check that we can read the first thing from each
+	 * asset in each reel.  This checks that when we do have a key it's the right one.
+	 */
 	try {
-		BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
-			shared_ptr<dcp::PictureAsset> pic = i->main_picture()->asset ();
-			shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (pic);
-			shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (pic);
+		for (auto i: cpl->reels()) {
+			auto pic = i->main_picture()->asset();
+			if (pic->encrypted() && !pic->key()) {
+				_kdm_valid = false;
+			}
+			auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(pic);
+			auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset>(pic);
 
 			if (mono) {
 				mono->start_read()->get_frame(0)->xyz_image ();
 			} else {
-				stereo->start_read()->get_frame(0)->xyz_image (dcp::EYE_LEFT);
+				stereo->start_read()->get_frame(0)->xyz_image(dcp::Eye::LEFT);
 			}
 
 			if (i->main_sound()) {
-				shared_ptr<dcp::SoundAsset> sound = i->main_sound()->asset ();
+				auto sound = i->main_sound()->asset ();
+				if (sound->encrypted() && !sound->key()) {
+					_kdm_valid = false;
+				}
 				i->main_sound()->asset()->start_read()->get_frame(0);
 			}
 
 			if (i->main_subtitle()) {
-				i->main_subtitle()->asset()->subtitles ();
+				auto sub = i->main_subtitle()->asset();
+				auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
+				if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
+					_kdm_valid = false;
+				}
+				sub->subtitles ();
+			}
+
+			if (i->atmos()) {
+				auto atmos = i->atmos()->asset();
+				if (atmos->encrypted() && !atmos->key()) {
+					_kdm_valid = false;
+				}
+				atmos->start_read()->get_frame(0);
 			}
 		}
 	} catch (dcp::ReadError& e) {
@@ -232,10 +277,13 @@ 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();
+	for (auto i: cpl->content_versions()) {
+		_content_versions.push_back (i.label_text);
+	}
 
 	_cpl = cpl->id ();
 }