X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=ffdcad1c144fd0030a70eefc6215497fecc783f2;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=89ddfd6eae907b49c3d1d46237275eea6a280ef6;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 89ddfd6ea..ffdcad1c1 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -53,7 +53,10 @@ 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)
@@ -108,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 ()) {
@@ -159,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 ()) {
@@ -169,6 +182,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 +193,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());
 		}
 
@@ -212,30 +226,57 @@ 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 ();
+				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()) {
-				shared_ptr<dcp::SoundAsset> sound = i->main_sound()->asset ();
-				i->main_sound()->asset()->start_read()->get_frame(0);
+				auto sound = i->main_sound()->asset ();
+				if (sound->encrypted() && !sound->key()) {
+					_kdm_valid = false;
+				}
+				auto reader = i->main_sound()->asset()->start_read();
+				reader->set_check_hmac (false);
+				reader->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;
+				}
+				auto reader = atmos->start_read();
+				reader->set_check_hmac (false);
+				reader->get_frame(0);
 			}
 		}
 	} catch (dcp::ReadError& e) {
@@ -244,8 +285,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();