X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fdcp_examiner.cc;h=b1d278893b51c6b1f003bace8880e4210b4626c6;hb=69bf81876af1c280aa992c1a46bf5e863d4c7c97;hp=219c3ee6ed66e993afd40bcd86922db01575580d;hpb=2846a509d6403d5fe1e7c2c471c85a913fabc716;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 219c3ee6e..b1d278893 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -19,33 +19,33 @@
 */
 
 
-#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_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"
@@ -59,7 +59,6 @@ using boost::optional;
 
 
 DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
-	: DCP (content, tolerant)
 {
 	shared_ptr<dcp::CPL> cpl;
 
@@ -67,9 +66,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 +80,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,6 +108,10 @@ 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 ();
@@ -210,7 +215,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			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 ()) {
@@ -256,6 +261,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			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);
@@ -274,6 +281,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				auto sound = i->main_sound()->asset ();
 				if (sound->encrypted() && !sound->key()) {
 					_kdm_valid = false;
+					LOG_GENERAL_NC ("Sound has no key");
+					break;
 				}
 				auto reader = i->main_sound()->asset()->start_read();
 				reader->set_check_hmac (false);
@@ -285,6 +294,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 ();
 			}
@@ -293,6 +304,8 @@ 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;
 				}
 				auto reader = atmos->start_read();
 				reader->set_check_hmac (false);
@@ -301,8 +314,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 		}
 	} 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();