X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=a0bc487d9a8d0df4b1114acbcb2a4d3d2962eaad;hb=4e9a15d558ecca660eb74f54b693d1e4a3aa7381;hp=5ea56835926c1b17b073666142732a559e4b212e;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 5ea568359..a0bc487d9 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -53,24 +53,17 @@ using std::cout;
 using std::runtime_error;
 using std::map;
 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)
-	, _has_atmos (false)
-	, _atmos_length (0)
 {
 	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;
 	}
 
@@ -118,6 +111,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 ()) {
@@ -127,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;
@@ -136,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 ()) {
@@ -154,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 ();
@@ -169,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 ()) {
@@ -178,7 +181,8 @@ 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());
 		}
 
 		for (auto j: i->closed_captions()) {
@@ -188,12 +192,12 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				return;
 			}
 
-			_text_count[TEXT_CLOSED_CAPTION]++;
+			_text_count[static_cast<int>(TextType::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();
+			auto rm = i->main_markers()->get();
 			_markers.insert (rm.begin(), rm.end());
 		}
 
@@ -222,12 +226,19 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	_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 {
 		for (auto i: cpl->reels()) {
-			auto pic = i->main_picture()->asset ();
-			auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (pic);
-			auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (pic);
+			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 ();
@@ -236,16 +247,28 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			}
 
 			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()) {
-				i->atmos()->asset()->start_read()->get_frame(0);
+				auto atmos = i->atmos()->asset();
+				if (atmos->encrypted() && !atmos->key()) {
+					_kdm_valid = false;
+				}
+				atmos->start_read()->get_frame(0);
 			}
 		}
 	} catch (dcp::ReadError& e) {