X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=5de8c89050caf391ed57848e64d433ed9414f7e9;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=f61e2a7de1f0dad23073339ee1f07c08505136da;hpb=1a34aa0b91c86fa02642152bf71bbb5d620bdbd9;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index f61e2a7de..5de8c8905 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -19,33 +19,34 @@
 */
 
 
-#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"
@@ -53,13 +54,14 @@
 
 using std::cout;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 using std::shared_ptr;
 using std::string;
+using std::vector;
 using boost::optional;
 
 
 DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
-	: DCP (content, tolerant)
 {
 	shared_ptr<dcp::CPL> cpl;
 
@@ -67,19 +69,21 @@ 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()) {
-			if (i->id() == content->cpl().get()) {
-				cpl = i;
-			}
+		/* Use the CPL that was specified, or that the content was using before */
+		auto iter = std::find_if(cpls.begin(), cpls.end(), [content](shared_ptr<dcp::CPL> cpl) { return cpl->id() == content->cpl().get(); });
+		if (iter == cpls.end()) {
+			throw CPLNotFoundError(content->cpl().get());
 		}
+		cpl = *iter;
 	} else {
 		/* Choose the CPL with the fewest unsatisfied references */
 
 		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 +111,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 ();
@@ -126,6 +134,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
 	for (auto i: cpl->reels()) {
 		LOG_GENERAL ("Reel %1", i->id());
+		vector<shared_ptr<dcpomatic::Font>> reel_fonts;
 
 		if (i->main_picture ()) {
 			if (!i->main_picture()->asset_ref().resolved()) {
@@ -197,6 +206,10 @@ 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 const& font: i->main_subtitle()->asset()->font_data()) {
+				reel_fonts.push_back(make_shared<dcpomatic::Font>(font.first, font.second));
+			}
 		}
 
 		for (auto j: i->closed_captions()) {
@@ -238,6 +251,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 		} else if (!i->atmos()) {
 			_reel_lengths.push_back (i->atmos()->actual_duration());
 		}
+
+		_fonts.push_back(reel_fonts);
 	}
 
 	_encrypted = cpl->any_encrypted ();
@@ -257,6 +272,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			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);
@@ -276,6 +292,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				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);
@@ -288,6 +305,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
 					_kdm_valid = false;
 					LOG_GENERAL_NC ("Subtitle has no key");
+					break;
 				}
 				sub->subtitles ();
 			}
@@ -297,6 +315,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				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);