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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index b431cec26..f2ec68bdd 100644
--- 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,48 +18,48 @@
 
 */
 
-#include "dcp_examiner.h"
+
+#include "config.h"
 #include "dcp_content.h"
+#include "dcp_examiner.h"
+#include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "image.h"
-#include "config.h"
 #include "util.h"
+#include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
-#include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/reel_picture_asset.h>
-#include <dcp/reel_sound_asset.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
-#include <dcp/stereo_picture_frame.h>
-#include <dcp/sound_asset.h>
-#include <dcp/sound_asset_reader.h>
-#include <dcp/subtitle_asset.h>
+#include <dcp/reel.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/reel_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
+#include <dcp/search.h>
+#include <dcp/sound_asset.h>
 #include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/stereo_picture_frame.h>
+#include <dcp/subtitle_asset.h>
 #include <iostream>
 
 #include "i18n.h"
 
-using std::list;
+
 using std::cout;
-using std::runtime_error;
-using std::map;
+using std::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)
 {
 	shared_ptr<dcp::CPL> cpl;
 
@@ -67,9 +67,11 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 		_text_count[i] = 0;
 	}
 
+	auto cpls = dcp::find_and_resolve_cpls (content->directories(), tolerant);
+
 	if (content->cpl ()) {
 		/* Use the CPL that the content was using before */
-		for (auto i: cpls()) {
+		for (auto i: cpls) {
 			if (i->id() == content->cpl().get()) {
 				cpl = i;
 			}
@@ -79,7 +81,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
 		int least_unsatisfied = INT_MAX;
 
-		for (auto i: cpls()) {
+		for (auto i: cpls) {
 			int unsatisfied = 0;
 			for (auto j: i->reels()) {
 				if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) {
@@ -107,10 +109,16 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 		throw DCPError ("No CPLs found in DCP");
 	}
 
+	if (content->kdm()) {
+		cpl->add (decrypt_kdm_with_helpful_error(content->kdm().get()));
+	}
+
 	_cpl = cpl->id ();
 	_name = cpl->content_title_text ();
 	_content_kind = cpl->content_kind ();
 
+	LOG_GENERAL ("Selected CPL %1", _cpl);
+
 	auto try_to_parse_language = [](optional<string> lang) -> boost::optional<dcp::LanguageTag> {
 		try {
 			if (lang) {
@@ -120,15 +128,21 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 		return boost::none;
 	};
 
+	LOG_GENERAL ("Looking at %1 reels", cpl->reels().size());
+
 	for (auto i: cpl->reels()) {
+		LOG_GENERAL ("Reel %1", i->id());
 
 		if (i->main_picture ()) {
 			if (!i->main_picture()->asset_ref().resolved()) {
 				/* We are missing this asset so we can't continue; examination will be repeated later */
 				_needs_assets = true;
+				LOG_GENERAL ("Main picture %1 of reel %2 is missing", i->main_picture()->id(), i->id());
 				return;
 			}
 
+			LOG_GENERAL ("Main picture %1 of reel %2 found", i->main_picture()->id(), i->id());
+
 			auto const frac = i->main_picture()->edit_rate ();
 			float const fr = float(frac.numerator) / frac.denominator;
 			if (!_video_frame_rate) {
@@ -152,9 +166,12 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			if (!i->main_sound()->asset_ref().resolved()) {
 				/* We are missing this asset so we can't continue; examination will be repeated later */
 				_needs_assets = true;
+				LOG_GENERAL ("Main sound %1 of reel %2 is missing", i->main_sound()->id(), i->id());
 				return;
 			}
 
+			LOG_GENERAL ("Main sound %1 of reel %2 found", i->main_sound()->id(), i->id());
+
 			_has_audio = true;
 			auto asset = i->main_sound()->asset();
 
@@ -178,9 +195,12 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			if (!i->main_subtitle()->asset_ref().resolved()) {
 				/* We are missing this asset so we can't continue; examination will be repeated later */
 				_needs_assets = true;
+				LOG_GENERAL ("Main subtitle %1 of reel %2 is missing", i->main_subtitle()->id(), i->id());
 				return;
 			}
 
+			LOG_GENERAL ("Main subtitle %1 of reel %2 found", i->main_subtitle()->id(), i->id());
+
 			_text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
 			_open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
 		}
@@ -189,11 +209,14 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			if (!j->asset_ref().resolved()) {
 				/* We are missing this asset so we can't continue; examination will be repeated later */
 				_needs_assets = true;
+				LOG_GENERAL ("Closed caption %1 of reel %2 is missing", j->id(), i->id());
 				return;
 			}
 
+			LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id());
+
 			_text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
-			_dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), try_to_parse_language(j->language())));
+			_dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text().get_value_or(""), try_to_parse_language(j->language())));
 		}
 
 		if (i->main_markers ()) {
@@ -226,6 +249,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	_encrypted = cpl->any_encrypted ();
 	_kdm_valid = true;
 
+	LOG_GENERAL_NC ("Check that everything encrypted has a key");
+
 	/* 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
@@ -233,25 +258,36 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	 */
 	try {
 		for (auto i: cpl->reels()) {
+			LOG_GENERAL ("Reel %1", i->id());
 			auto pic = i->main_picture()->asset();
 			if (pic->encrypted() && !pic->key()) {
 				_kdm_valid = false;
+				LOG_GENERAL_NC ("Picture has no key");
+				break;
 			}
 			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()) {
 				auto sound = i->main_sound()->asset ();
 				if (sound->encrypted() && !sound->key()) {
 					_kdm_valid = false;
+					LOG_GENERAL_NC ("Sound has no key");
+					break;
 				}
-				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()) {
@@ -259,6 +295,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
 				if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
 					_kdm_valid = false;
+					LOG_GENERAL_NC ("Subtitle has no key");
+					break;
 				}
 				sub->subtitles ();
 			}
@@ -267,14 +305,20 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				auto atmos = i->atmos()->asset();
 				if (atmos->encrypted() && !atmos->key()) {
 					_kdm_valid = false;
+					LOG_GENERAL_NC ("ATMOS sound has no key");
+					break;
 				}
-				atmos->start_read()->get_frame(0);
+				auto reader = atmos->start_read();
+				reader->set_check_hmac (false);
+				reader->get_frame(0);
 			}
 		}
 	} catch (dcp::ReadError& e) {
 		_kdm_valid = false;
+		LOG_GENERAL ("KDM is invalid: %1", e.what());
 	} catch (dcp::MiscError& e) {
 		_kdm_valid = false;
+		LOG_GENERAL ("KDM is invalid: %1", e.what());
 	}
 
 	_standard = cpl->standard();