X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=7c8172b2ca62a118601e9a58b654d7147a230592;hb=d0b66e88b9cab20b8415681f1781b772a3dfecc5;hp=219c3ee6ed66e993afd40bcd86922db01575580d;hpb=2846a509d6403d5fe1e7c2c471c85a913fabc716;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 219c3ee6e..7c8172b2c 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,33 +54,32 @@
 
 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;
 
-	for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
-		_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 +107,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 ();
@@ -124,20 +128,21 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
 	LOG_GENERAL ("Looking at %1 reels", cpl->reels().size());
 
-	for (auto i: cpl->reels()) {
-		LOG_GENERAL ("Reel %1", i->id());
+	for (auto reel: cpl->reels()) {
+		LOG_GENERAL("Reel %1", reel->id());
+		vector<shared_ptr<dcpomatic::Font>> reel_fonts;
 
-		if (i->main_picture ()) {
-			if (!i->main_picture()->asset_ref().resolved()) {
+		if (reel->main_picture()) {
+			if (!reel->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());
+				LOG_GENERAL("Main picture %1 of reel %2 is missing", reel->main_picture()->id(), reel->id());
 				return;
 			}
 
-			LOG_GENERAL ("Main picture %1 of reel %2 found", i->main_picture()->id(), i->id());
+			LOG_GENERAL("Main picture %1 of reel %2 found", reel->main_picture()->id(), reel->id());
 
-			auto const frac = i->main_picture()->edit_rate ();
+			auto const frac = reel->main_picture()->edit_rate();
 			float const fr = float(frac.numerator) / frac.denominator;
 			if (!_video_frame_rate) {
 				_video_frame_rate = fr;
@@ -146,28 +151,28 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			}
 
 			_has_video = true;
-			auto asset = i->main_picture()->asset();
+			auto asset = reel->main_picture()->asset();
 			if (!_video_size) {
 				_video_size = asset->size ();
 			} else if (_video_size.get() != asset->size ()) {
 				throw DCPError (_("Mismatched video sizes in DCP"));
 			}
 
-			_video_length += i->main_picture()->actual_duration();
+			_video_length += reel->main_picture()->actual_duration();
 		}
 
-		if (i->main_sound ()) {
-			if (!i->main_sound()->asset_ref().resolved()) {
+		if (reel->main_sound()) {
+			if (!reel->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());
+				LOG_GENERAL("Main sound %1 of reel %2 is missing", reel->main_sound()->id(), reel->id());
 				return;
 			}
 
-			LOG_GENERAL ("Main sound %1 of reel %2 found", i->main_sound()->id(), i->id());
+			LOG_GENERAL("Main sound %1 of reel %2 found", reel->main_sound()->id(), reel->id());
 
 			_has_audio = true;
-			auto asset = i->main_sound()->asset();
+			auto asset = reel->main_sound()->asset();
 
 			if (!_audio_channels) {
 				_audio_channels = asset->channels ();
@@ -181,63 +186,73 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 				throw DCPError (_("Mismatched audio sample rates in DCP"));
 			}
 
-			_audio_length += i->main_sound()->actual_duration();
+			_audio_length += reel->main_sound()->actual_duration();
 			_audio_language = try_to_parse_language (asset->language());
 		}
 
-		if (i->main_subtitle ()) {
-			if (!i->main_subtitle()->asset_ref().resolved()) {
+		if (reel->main_subtitle()) {
+			if (!reel->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());
+				LOG_GENERAL("Main subtitle %1 of reel %2 is missing", reel->main_subtitle()->id(), reel->id());
 				return;
 			}
 
-			LOG_GENERAL ("Main subtitle %1 of reel %2 found", i->main_subtitle()->id(), i->id());
+			LOG_GENERAL("Main subtitle %1 of reel %2 found", reel->main_subtitle()->id(), reel->id());
+
+			_text_count[TextType::OPEN_SUBTITLE] = 1;
+			_open_subtitle_language = try_to_parse_language(reel->main_subtitle()->language());
 
-			_text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
-			_open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
+			for (auto const& font: reel->main_subtitle()->asset()->font_data()) {
+				reel_fonts.push_back(make_shared<dcpomatic::Font>(font.first, font.second));
+			}
 		}
 
-		for (auto j: i->closed_captions()) {
+		for (auto j: reel->closed_captions()) {
 			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());
+				LOG_GENERAL("Closed caption %1 of reel %2 is missing", j->id(), reel->id());
 				return;
 			}
 
-			LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id());
+			LOG_GENERAL("Closed caption %1 of reel %2 found", j->id(), reel->id());
 
-			_text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
-			_dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), try_to_parse_language(j->language())));
+			_text_count[TextType::CLOSED_CAPTION]++;
+			_dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text().get_value_or(""), try_to_parse_language(j->language())));
 		}
 
-		if (i->main_markers ()) {
-			auto rm = i->main_markers()->get();
+		if (reel->main_markers ()) {
+			auto rm = reel->main_markers()->get();
 			_markers.insert (rm.begin(), rm.end());
 		}
 
-		if (i->atmos()) {
+		if (reel->atmos()) {
 			_has_atmos = true;
-			_atmos_length += i->atmos()->actual_duration();
+			_atmos_length += reel->atmos()->actual_duration();
 			if (_atmos_edit_rate != dcp::Fraction()) {
-				DCPOMATIC_ASSERT (i->atmos()->edit_rate() == _atmos_edit_rate);
+				DCPOMATIC_ASSERT(reel->atmos()->edit_rate() == _atmos_edit_rate);
 			}
-			_atmos_edit_rate = i->atmos()->edit_rate();
+			_atmos_edit_rate = reel->atmos()->edit_rate();
+		}
+
+		if (reel->main_picture()) {
+			_reel_lengths.push_back(reel->main_picture()->actual_duration());
+		} else if (reel->main_sound()) {
+			_reel_lengths.push_back(reel->main_sound()->actual_duration());
+		} else if (reel->main_subtitle()) {
+			_reel_lengths.push_back(reel->main_subtitle()->actual_duration());
+		} else if (!reel->closed_captions().empty()) {
+			_reel_lengths.push_back(reel->closed_captions().front()->actual_duration());
+		} else if (!reel->atmos()) {
+			_reel_lengths.push_back(reel->atmos()->actual_duration());
 		}
 
-		if (i->main_picture()) {
-			_reel_lengths.push_back (i->main_picture()->actual_duration());
-		} else if (i->main_sound()) {
-			_reel_lengths.push_back (i->main_sound()->actual_duration());
-		} else if (i->main_subtitle()) {
-			_reel_lengths.push_back (i->main_subtitle()->actual_duration());
-		} else if (!i->closed_captions().empty()) {
-			_reel_lengths.push_back (i->closed_captions().front()->actual_duration());
-		} else if (!i->atmos()) {
-			_reel_lengths.push_back (i->atmos()->actual_duration());
+		if (reel_fonts.empty()) {
+			reel_fonts.push_back(make_shared<dcpomatic::Font>(""));
 		}
+
+		_fonts.push_back(reel_fonts);
 	}
 
 	_encrypted = cpl->any_encrypted ();
@@ -256,6 +271,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 +291,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 +304,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 +314,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 +324,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();