X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=cf4835c062057fd99b278882737001e9b1d7c15c;hb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;hp=ffdcad1c144fd0030a70eefc6215497fecc783f2;hpb=a498b8819ab431ecc2aac058b1aadb9e15d396ac;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index ffdcad1c1..cf4835c06 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,43 +18,43 @@
 
 */
 
-#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/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;
 
 
@@ -111,6 +111,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 	_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 +122,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 +160,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 +189,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 +203,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 +243,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,9 +252,12 @@ 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);
@@ -254,6 +276,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);
@@ -265,6 +289,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 ();
 			}
@@ -273,6 +299,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);
@@ -281,8 +309,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();