X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fverify.cc;h=ec8925f2ffba6a5a6c2713d0f7d6a4dd8cb39a16;hb=4b2a91af4331c1c7bc540fb352b1099292b5f753;hp=1fc9e851839ede47f977a7456bed794b919789d3;hpb=056e3a4a7b41d4f78b73d46bba1973c5f1ffa139;p=libdcp.git

diff --git a/src/verify.cc b/src/verify.cc
index 1fc9e851..ec8925f2 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -41,6 +41,7 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "exceptions.h"
+#include "filesystem.h"
 #include "interop_subtitle_asset.h"
 #include "mono_picture_asset.h"
 #include "mono_picture_frame.h"
@@ -80,6 +81,7 @@
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <map>
+#include <numeric>
 #include <regex>
 #include <set>
 #include <vector>
@@ -384,9 +386,26 @@ enum class VerifyAssetResult {
 
 
 static VerifyAssetResult
-verify_asset (shared_ptr<const DCP> dcp, shared_ptr<const ReelFileAsset> reel_file_asset, function<void (float)> progress)
+verify_asset(
+	shared_ptr<const DCP> dcp,
+	shared_ptr<const ReelFileAsset> reel_file_asset,
+	function<void (float)> progress,
+	string* reference_hash,
+	string* calculated_hash
+	)
 {
-	auto const actual_hash = reel_file_asset->asset_ref()->hash(progress);
+	DCP_ASSERT(reference_hash);
+	DCP_ASSERT(calculated_hash);
+
+	/* When reading the DCP the hash will have been set to the one from the PKL/CPL.
+	 * We want to calculate the hash of the actual file contents here, so that we
+	 * can check it.  unset_hash() means that this calculation will happen on the
+	 * call to hash().
+	 */
+	reel_file_asset->asset_ref()->unset_hash();
+	*calculated_hash = reel_file_asset->asset_ref()->hash([progress](int64_t done, int64_t total) {
+		progress(float(done) / total);
+	});
 
 	auto pkls = dcp->pkls();
 	/* We've read this DCP in so it must have at least one PKL */
@@ -394,22 +413,23 @@ verify_asset (shared_ptr<const DCP> dcp, shared_ptr<const ReelFileAsset> reel_fi
 
 	auto asset = reel_file_asset->asset_ref().asset();
 
-	optional<string> pkl_hash;
+	optional<string> maybe_pkl_hash;
 	for (auto i: pkls) {
-		pkl_hash = i->hash (reel_file_asset->asset_ref()->id());
-		if (pkl_hash) {
+		maybe_pkl_hash = i->hash (reel_file_asset->asset_ref()->id());
+		if (maybe_pkl_hash) {
 			break;
 		}
 	}
 
-	DCP_ASSERT (pkl_hash);
+	DCP_ASSERT(maybe_pkl_hash);
+	*reference_hash = *maybe_pkl_hash;
 
 	auto cpl_hash = reel_file_asset->hash();
-	if (cpl_hash && *cpl_hash != *pkl_hash) {
+	if (cpl_hash && *cpl_hash != *reference_hash) {
 		return VerifyAssetResult::CPL_PKL_DIFFER;
 	}
 
-	if (actual_hash != *pkl_hash) {
+	if (*calculated_hash != *reference_hash) {
 		return VerifyAssetResult::BAD;
 	}
 
@@ -429,9 +449,8 @@ verify_language_tag (string tag, vector<VerificationNote>& notes)
 
 
 static void
-verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::filesystem::path file, vector<VerificationNote>& notes, function<void (float)> progress)
+verify_picture_asset(shared_ptr<const ReelFileAsset> reel_file_asset, boost::filesystem::path file, int64_t start_frame, vector<VerificationNote>& notes, function<void (float)> progress)
 {
-	int biggest_frame = 0;
 	auto asset = dynamic_pointer_cast<PictureAsset>(reel_file_asset->asset_ref().asset());
 	auto const duration = asset->intrinsic_duration ();
 
@@ -443,14 +462,33 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
 		}
 	};
 
+	int const max_frame =   rint(250 * 1000000 / (8 * asset->edit_rate().as_float()));
+	int const risky_frame = rint(230 * 1000000 / (8 * asset->edit_rate().as_float()));
+
+	auto check_frame_size = [max_frame, risky_frame, file, start_frame](int index, int size, int frame_rate, vector<VerificationNote>& notes) {
+		if (size > max_frame) {
+			notes.push_back(
+				VerificationNote(
+					VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+					).set_frame(start_frame + index).set_frame_rate(frame_rate)
+			);
+		} else if (size > risky_frame) {
+			notes.push_back(
+				VerificationNote(
+					VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+					).set_frame(start_frame + index).set_frame_rate(frame_rate)
+			);
+		}
+	};
+
 	if (auto mono_asset = dynamic_pointer_cast<MonoPictureAsset>(reel_file_asset->asset_ref().asset())) {
 		auto reader = mono_asset->start_read ();
 		for (int64_t i = 0; i < duration; ++i) {
 			auto frame = reader->get_frame (i);
-			biggest_frame = max(biggest_frame, frame->size());
+			check_frame_size(i, frame->size(), mono_asset->frame_rate().numerator, notes);
 			if (!mono_asset->encrypted() || mono_asset->key()) {
 				vector<VerificationNote> j2k_notes;
-				verify_j2k(frame, i, mono_asset->frame_rate().numerator, j2k_notes);
+				verify_j2k(frame, start_frame, i, mono_asset->frame_rate().numerator, j2k_notes);
 				check_and_add (j2k_notes);
 			}
 			progress (float(i) / duration);
@@ -459,29 +497,18 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
 		auto reader = stereo_asset->start_read ();
 		for (int64_t i = 0; i < duration; ++i) {
 			auto frame = reader->get_frame (i);
-			biggest_frame = max(biggest_frame, max(frame->left()->size(), frame->right()->size()));
+			check_frame_size(i, frame->left()->size(), stereo_asset->frame_rate().numerator, notes);
+			check_frame_size(i, frame->right()->size(), stereo_asset->frame_rate().numerator, notes);
 			if (!stereo_asset->encrypted() || stereo_asset->key()) {
 				vector<VerificationNote> j2k_notes;
-				verify_j2k(frame->left(), i, stereo_asset->frame_rate().numerator, j2k_notes);
-				verify_j2k(frame->right(), i, stereo_asset->frame_rate().numerator, j2k_notes);
+				verify_j2k(frame->left(), start_frame, i, stereo_asset->frame_rate().numerator, j2k_notes);
+				verify_j2k(frame->right(), start_frame, i, stereo_asset->frame_rate().numerator, j2k_notes);
 				check_and_add (j2k_notes);
 			}
 			progress (float(i) / duration);
 		}
 
 	}
-
-	static const int max_frame =   rint(250 * 1000000 / (8 * asset->edit_rate().as_float()));
-	static const int risky_frame = rint(230 * 1000000 / (8 * asset->edit_rate().as_float()));
-	if (biggest_frame > max_frame) {
-		notes.push_back ({
-			VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
-		});
-	} else if (biggest_frame > risky_frame) {
-		notes.push_back ({
-			VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
-		});
-	}
 }
 
 
@@ -489,6 +516,7 @@ static void
 verify_main_picture_asset (
 	shared_ptr<const DCP> dcp,
 	shared_ptr<const ReelPictureAsset> reel_asset,
+	int64_t start_frame,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	function<void (float)> progress,
 	VerificationOptions options,
@@ -498,14 +526,20 @@ verify_main_picture_asset (
 	auto asset = reel_asset->asset();
 	auto const file = *asset->file();
 
-	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
 		stage ("Checking picture asset hash", file);
-		auto const r = verify_asset (dcp, reel_asset, progress);
+		string reference_hash;
+		string calculated_hash;
+		auto const r = verify_asset(dcp, reel_asset, progress, &reference_hash, &calculated_hash);
 		switch (r) {
 			case VerifyAssetResult::BAD:
-				notes.push_back ({
-					VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
-				});
+				notes.push_back(
+					dcp::VerificationNote(
+						VerificationNote::Type::ERROR,
+						VerificationNote::Code::INCORRECT_PICTURE_HASH,
+						file
+						).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
+					);
 				break;
 			case VerifyAssetResult::CPL_PKL_DIFFER:
 				notes.push_back ({
@@ -518,7 +552,7 @@ verify_main_picture_asset (
 	}
 
 	stage ("Checking picture frame sizes", asset->file());
-	verify_picture_asset (reel_asset, file, notes, progress);
+	verify_picture_asset(reel_asset, file, start_frame, notes, progress);
 
 	/* Only flat/scope allowed by Bv2.1 */
 	if (
@@ -594,12 +628,20 @@ verify_main_sound_asset (
 	auto asset = reel_asset->asset();
 	auto const file = *asset->file();
 
-	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
 		stage("Checking sound asset hash", file);
-		auto const r = verify_asset (dcp, reel_asset, progress);
+		string reference_hash;
+		string calculated_hash;
+		auto const r = verify_asset(dcp, reel_asset, progress, &reference_hash, &calculated_hash);
 		switch (r) {
 			case VerifyAssetResult::BAD:
-				notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, file});
+				notes.push_back(
+					dcp::VerificationNote(
+						VerificationNote::Type::ERROR,
+						VerificationNote::Code::INCORRECT_SOUND_HASH,
+						file
+						).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
+					);
 				break;
 			case VerifyAssetResult::CPL_PKL_DIFFER:
 				notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, file});
@@ -672,7 +714,7 @@ verify_smpte_timed_text_asset (
 		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, *asset->file() });
 	}
 
-	auto const size = boost::filesystem::file_size(asset->file().get());
+	auto const size = filesystem::file_size(asset->file().get());
 	if (size > 115 * 1024 * 1024) {
 		notes.push_back (
 			{ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, raw_convert<string>(size), *asset->file() }
@@ -709,9 +751,9 @@ verify_smpte_timed_text_asset (
 }
 
 
-/** Verify Interop subtitle-only stuff */
+/** Verify Interop subtitle / CCAP stuff */
 void
-verify_interop_subtitle_asset(shared_ptr<const InteropSubtitleAsset> asset, vector<VerificationNote>& notes)
+verify_interop_text_asset(shared_ptr<const InteropSubtitleAsset> asset, vector<VerificationNote>& notes)
 {
 	if (asset->subtitles().empty()) {
 		notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_SUBTITLE, asset->id(), asset->file().get() });
@@ -800,7 +842,7 @@ verify_subtitle_asset (
 
 	auto interop = dynamic_pointer_cast<const InteropSubtitleAsset>(asset);
 	if (interop) {
-		verify_interop_subtitle_asset(interop, notes);
+		verify_interop_text_asset(interop, notes);
 		if (namespace_count(asset, "DCSubtitle") > 1) {
 			notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() });
 		}
@@ -842,6 +884,11 @@ verify_closed_caption_asset (
 		notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED});
 	}
 
+	auto interop = dynamic_pointer_cast<const InteropSubtitleAsset>(asset);
+	if (interop) {
+		verify_interop_text_asset(interop, notes);
+	}
+
 	auto smpte = dynamic_pointer_cast<const SMPTESubtitleAsset>(asset);
 	if (smpte) {
 		verify_smpte_timed_text_asset (smpte, reel_asset_duration, notes);
@@ -859,7 +906,8 @@ verify_text_details (
 	vector<VerificationNote>& notes,
 	std::function<bool (shared_ptr<Reel>)> check,
 	std::function<optional<string> (shared_ptr<Reel>)> xml,
-	std::function<int64_t (shared_ptr<Reel>)> duration
+	std::function<int64_t (shared_ptr<Reel>)> duration,
+	std::function<std::string (shared_ptr<Reel>)> id
 	)
 {
 	/* end of last subtitle (in editable units) */
@@ -871,16 +919,18 @@ verify_text_details (
 	auto empty_text = false;
 	/* current reel start time (in editable units) */
 	int64_t reel_offset = 0;
-	vector<string> font_ids;
 	optional<string> missing_load_font_id;
 
-	std::function<void (cxml::ConstNodePtr, optional<int>, optional<Time>, int, bool)> parse;
-	parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset, &font_ids, &missing_load_font_id](
+	std::function<void (cxml::ConstNodePtr, optional<int>, optional<Time>, int, bool, bool&, vector<string>&)> parse;
+
+	parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset, &missing_load_font_id](
 		cxml::ConstNodePtr node,
 		optional<int> tcr,
 		optional<Time> start_time,
 		int er,
-		bool first_reel
+		bool first_reel,
+		bool& has_text,
+		vector<string>& font_ids
 		) {
 		if (node->name() == "Subtitle") {
 			Time in (node->string_attribute("TimeIn"), tcr);
@@ -921,9 +971,12 @@ verify_text_details (
 			if (!node_has_content(node)) {
 				empty_text = true;
 			}
+			has_text = true;
 		} else if (node->name() == "LoadFont") {
 			if (auto const id = node->optional_string_attribute("Id")) {
 				font_ids.push_back(*id);
+			} else if (auto const id = node->optional_string_attribute("ID")) {
+				font_ids.push_back(*id);
 			}
 		} else if (node->name() == "Font") {
 			if (auto const font_id = node->optional_string_attribute("Id")) {
@@ -933,7 +986,7 @@ verify_text_details (
 			}
 		}
 		for (auto i: node->node_children()) {
-			parse(i, tcr, start_time, er, first_reel);
+			parse(i, tcr, start_time, er, first_reel, has_text, font_ids);
 		}
 	};
 
@@ -969,12 +1022,18 @@ verify_text_details (
 			}
 			break;
 		}
-		parse (doc, tcr, start_time, edit_rate, i == 0);
+		bool has_text = false;
+		vector<string> font_ids;
+		parse(doc, tcr, start_time, edit_rate, i == 0, has_text, font_ids);
 		auto end = reel_offset + duration(reels[i]);
 		if (last_out && *last_out > end) {
 			reel_overlap = true;
 		}
 		reel_offset = end;
+
+		if (standard == dcp::Standard::SMPTE && has_text && font_ids.empty()) {
+			notes.push_back(dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_LOAD_FONT).set_id(id(reels[i])));
+		}
 	}
 
 	if (last_out && *last_out > reel_offset) {
@@ -1124,18 +1183,9 @@ verify_closed_caption_details (
 }
 
 
-struct LinesCharactersResult
-{
-	bool warning_length_exceeded = false;
-	bool error_length_exceeded = false;
-	bool line_count_exceeded = false;
-};
-
-
-static
 void
-verify_text_lines_and_characters (
-	shared_ptr<SubtitleAsset> asset,
+dcp::verify_text_lines_and_characters(
+	shared_ptr<const SubtitleAsset> asset,
 	int warning_length,
 	int error_length,
 	LinesCharactersResult* result
@@ -1156,8 +1206,8 @@ verify_text_lines_and_characters (
 		{}
 
 		Time time;
-		int position; //< position from 0 at top of screen to 100 at bottom
-		int characters;
+		int position = 0;   ///< vertical position from 0 at top of screen to 100 at bottom
+		int characters = 0; ///< number of characters in the text of this event
 		shared_ptr<Event> start;
 	};
 
@@ -1176,6 +1226,7 @@ verify_text_lines_and_characters (
 		return 0L;
 	};
 
+	/* Make a list of "subtitle starts" and "subtitle ends" events */
 	for (auto j: asset->subtitles()) {
 		auto text = dynamic_pointer_cast<const SubtitleString>(j);
 		if (text) {
@@ -1185,20 +1236,25 @@ verify_text_lines_and_characters (
 		}
 	}
 
-	std::sort(events.begin(), events.end(), [](shared_ptr<Event> const& a, shared_ptr<Event>const& b) {
+	std::sort(events.begin(), events.end(), [](shared_ptr<Event> const& a, shared_ptr<Event> const& b) {
 		return a->time < b->time;
 	});
 
-	map<int, int> current;
+	/* The number of characters currently displayed at different vertical positions, i.e. on
+	 * what we consider different lines.  Key is the vertical position (0 to 100) and the value
+	 * is a list of the active subtitles in that position.
+	 */
+	map<int, vector<shared_ptr<Event>>> current;
 	for (auto i: events) {
 		if (current.size() > 3) {
 			result->line_count_exceeded = true;
 		}
 		for (auto j: current) {
-			if (j.second > warning_length) {
+			int length = std::accumulate(j.second.begin(), j.second.end(), 0, [](int total, shared_ptr<const Event> event) { return total + event->characters; });
+			if (length > warning_length) {
 				result->warning_length_exceeded = true;
 			}
-			if (j.second > error_length) {
+			if (length > error_length) {
 				result->error_length_exceeded = true;
 			}
 		}
@@ -1206,17 +1262,20 @@ verify_text_lines_and_characters (
 		if (i->start) {
 			/* end of a subtitle */
 			DCP_ASSERT (current.find(i->start->position) != current.end());
-			if (current[i->start->position] == i->start->characters) {
+			auto current_position = current[i->start->position];
+			auto iter = std::find(current_position.begin(), current_position.end(), i->start);
+			if (iter != current_position.end()) {
+				current_position.erase(iter);
+			}
+			if (current_position.empty()) {
 				current.erase(i->start->position);
-			} else {
-				current[i->start->position] -= i->start->characters;
 			}
 		} else {
 			/* start of a subtitle */
 			if (current.find(i->position) == current.end()) {
-				current[i->position] = i->characters;
+				current[i->position] = vector<shared_ptr<Event>>{i};
 			} else {
-				current[i->position] += i->characters;
+				current[i->position].push_back(i);
 			}
 		}
 	}
@@ -1231,7 +1290,7 @@ verify_text_details(dcp::Standard standard, vector<shared_ptr<Reel>> reels, vect
 		return;
 	}
 
-	if (reels[0]->main_subtitle()) {
+	if (reels[0]->main_subtitle() && reels[0]->main_subtitle()->asset_ref().resolved()) {
 		verify_text_details(standard, reels, reels[0]->main_subtitle()->edit_rate().numerator, notes,
 			[](shared_ptr<Reel> reel) {
 				return static_cast<bool>(reel->main_subtitle());
@@ -1241,6 +1300,9 @@ verify_text_details(dcp::Standard standard, vector<shared_ptr<Reel>> reels, vect
 			},
 			[](shared_ptr<Reel> reel) {
 				return reel->main_subtitle()->actual_duration();
+			},
+			[](shared_ptr<Reel> reel) {
+				return reel->main_subtitle()->id();
 			}
 		);
 	}
@@ -1255,6 +1317,9 @@ verify_text_details(dcp::Standard standard, vector<shared_ptr<Reel>> reels, vect
 			},
 			[i](shared_ptr<Reel> reel) {
 				return reel->closed_captions()[i]->actual_duration();
+			},
+			[i](shared_ptr<Reel> reel) {
+				return reel->closed_captions()[i]->id();
 			}
 		);
 	}
@@ -1268,7 +1333,7 @@ verify_extension_metadata(shared_ptr<const CPL> cpl, vector<VerificationNote>& n
 {
 	DCP_ASSERT (cpl->file());
 	cxml::Document doc ("CompositionPlaylist");
-	doc.read_file (cpl->file().get());
+	doc.read_file(dcp::filesystem::fix_long_path(cpl->file().get()));
 
 	auto missing = false;
 	string malformed;
@@ -1352,6 +1417,7 @@ verify_reel(
 	shared_ptr<const DCP> dcp,
 	shared_ptr<const CPL> cpl,
 	shared_ptr<const Reel> reel,
+	int64_t start_frame,
 	optional<dcp::Size> main_picture_active_area,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	boost::filesystem::path xsd_dtd_directory,
@@ -1410,7 +1476,7 @@ verify_reel(
 		}
 		/* Check asset */
 		if (reel->main_picture()->asset_ref().resolved()) {
-			verify_main_picture_asset(dcp, reel->main_picture(), stage, progress, options, notes);
+			verify_main_picture_asset(dcp, reel->main_picture(), start_frame, stage, progress, options, notes);
 			auto const asset_size = reel->main_picture()->asset()->size();
 			if (main_picture_active_area) {
 				if (main_picture_active_area->width > asset_size.width) {
@@ -1431,6 +1497,7 @@ verify_reel(
 				}
 			}
 		}
+
 	}
 
 	if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
@@ -1523,6 +1590,15 @@ verify_cpl(
 		}
 	}
 
+	for (auto version: cpl->content_versions()) {
+		if (version.label_text.empty()) {
+			notes.push_back(
+				dcp::VerificationNote(VerificationNote::Type::WARNING, VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_id(cpl->id())
+				);
+			break;
+		}
+	}
+
 	if (dcp->standard() == Standard::SMPTE) {
 		if (!cpl->annotation_text()) {
 			notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
@@ -1534,8 +1610,16 @@ verify_cpl(
 	for (auto i: dcp->pkls()) {
 		/* Check that the CPL's hash corresponds to the PKL */
 		optional<string> h = i->hash(cpl->id());
-		if (h && make_digest(ArrayData(*cpl->file())) != *h) {
-			notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()});
+		auto calculated_cpl_hash = make_digest(ArrayData(*cpl->file()));
+		if (h && calculated_cpl_hash != *h) {
+			notes.push_back(
+				dcp::VerificationNote(
+					VerificationNote::Type::ERROR,
+					VerificationNote::Code::MISMATCHED_CPL_HASHES,
+					cpl->id(),
+					cpl->file().get()
+					).set_calculated_hash(calculated_cpl_hash).set_reference_hash(*h)
+				);
 		}
 
 		/* Check that any PKL with a single CPL has its AnnotationText the same as the CPL's ContentTitleText */
@@ -1588,12 +1672,14 @@ verify_cpl(
 			});
 	}
 
+	int64_t frame = 0;
 	for (auto reel: cpl->reels()) {
 		stage("Checking reel", optional<boost::filesystem::path>());
 		verify_reel(
 			dcp,
 			cpl,
 			reel,
+			frame,
 			main_picture_active_area,
 			stage,
 			xsd_dtd_directory,
@@ -1607,6 +1693,7 @@ verify_cpl(
 			&fewest_closed_captions,
 			&markers_seen
 			);
+		frame += reel->duration();
 	}
 
 	verify_text_details(dcp->standard().get_value_or(dcp::Standard::SMPTE), cpl->reels(), notes);
@@ -1659,7 +1746,7 @@ verify_cpl(
 
 		LinesCharactersResult result;
 		for (auto reel: cpl->reels()) {
-			if (reel->main_subtitle() && reel->main_subtitle()->asset()) {
+			if (reel->main_subtitle() && reel->main_subtitle()->asset_ref().resolved()) {
 				verify_text_lines_and_characters(reel->main_subtitle()->asset(), 52, 79, &result);
 			}
 		}
@@ -1700,7 +1787,7 @@ verify_cpl(
 		if (cpl->any_encrypted()) {
 			cxml::Document doc("CompositionPlaylist");
 			DCP_ASSERT(cpl->file());
-			doc.read_file(cpl->file().get());
+			doc.read_file(dcp::filesystem::fix_long_path(cpl->file().get()));
 			if (!doc.optional_node_child("Signature")) {
 				notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
 			}
@@ -1722,7 +1809,7 @@ verify_pkl(
 
 	if (pkl_has_encrypted_assets(dcp, pkl)) {
 		cxml::Document doc("PackingList");
-		doc.read_file(pkl->file().get());
+		doc.read_file(dcp::filesystem::fix_long_path(pkl->file().get()));
 		if (!doc.optional_node_child("Signature")) {
 			notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
 		}
@@ -1765,6 +1852,7 @@ verify_assetmap(
 vector<VerificationNote>
 dcp::verify (
 	vector<boost::filesystem::path> directories,
+	vector<dcp::DecryptedKDM> kdms,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	function<void (float)> progress,
 	VerificationOptions options,
@@ -1774,7 +1862,7 @@ dcp::verify (
 	if (!xsd_dtd_directory) {
 		xsd_dtd_directory = resources_directory() / "xsd";
 	}
-	*xsd_dtd_directory = boost::filesystem::canonical (*xsd_dtd_directory);
+	*xsd_dtd_directory = filesystem::canonical(*xsd_dtd_directory);
 
 	vector<VerificationNote> notes;
 	State state{};
@@ -1812,17 +1900,25 @@ dcp::verify (
 			notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_STANDARD});
 		}
 
+		for (auto kdm: kdms) {
+			dcp->add(kdm);
+		}
+
 		for (auto cpl: dcp->cpls()) {
-			verify_cpl(
-				dcp,
-				cpl,
-				stage,
-				*xsd_dtd_directory,
-				progress,
-				options,
-				notes,
-				state
-				);
+			try {
+				verify_cpl(
+					dcp,
+					cpl,
+					stage,
+					*xsd_dtd_directory,
+					progress,
+					options,
+					notes,
+					state
+					);
+			} catch (ReadError& e) {
+				notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+			}
 		}
 
 		for (auto pkl: dcp->pkls()) {
@@ -1859,15 +1955,15 @@ dcp::note_to_string (VerificationNote note)
 	case VerificationNote::Code::FAILED_READ:
 		return *note.note();
 	case VerificationNote::Code::MISMATCHED_CPL_HASHES:
-		return String::compose("The hash of the CPL %1 in the PKL does not agree with the CPL file.", note.note().get());
+		return String::compose("The hash (%1) of the CPL (%2) in the PKL does not agree with the CPL file (%3).", note.reference_hash().get(), note.note().get(), note.calculated_hash().get());
 	case VerificationNote::Code::INVALID_PICTURE_FRAME_RATE:
 		return String::compose("The picture in a reel has an invalid frame rate %1.", note.note().get());
 	case VerificationNote::Code::INCORRECT_PICTURE_HASH:
-		return String::compose("The hash of the picture asset %1 does not agree with the PKL file.", note.file()->filename());
+		return String::compose("The hash (%1) of the picture asset %2 does not agree with the PKL file (%3).", note.calculated_hash().get(), note.file()->filename(), note.reference_hash().get());
 	case VerificationNote::Code::MISMATCHED_PICTURE_HASHES:
 		return String::compose("The PKL and CPL hashes differ for the picture asset %1.", note.file()->filename());
 	case VerificationNote::Code::INCORRECT_SOUND_HASH:
-		return String::compose("The hash of the sound asset %1 does not agree with the PKL file.", note.file()->filename());
+		return String::compose("The hash (%1) of the sound asset %2 does not agree with the PKL file (%3).", note.calculated_hash().get(), note.file()->filename(), note.reference_hash().get());
 	case VerificationNote::Code::MISMATCHED_SOUND_HASHES:
 		return String::compose("The PKL and CPL hashes differ for the sound asset %1.", note.file()->filename());
 	case VerificationNote::Code::EMPTY_ASSET_PATH:
@@ -1885,9 +1981,19 @@ dcp::note_to_string (VerificationNote note)
 	case VerificationNote::Code::INVALID_DURATION:
 		return String::compose("The duration of the asset %1 is less than 1 second.", note.note().get());
 	case VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
-		return String::compose("The instantaneous bit rate of the picture asset %1 is larger than the limit of 250Mbit/s in at least one place.", note.file()->filename());
+		return String::compose(
+			"Frame %1 (timecode %2) in asset %3 has an instantaneous bit rate that is larger than the limit of 250Mbit/s.",
+			note.frame().get(),
+			dcp::Time(note.frame().get(), note.frame_rate().get(), note.frame_rate().get()).as_string(dcp::Standard::SMPTE),
+			note.file()->filename()
+			);
 	case VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
-		return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place.", note.file()->filename());
+		return String::compose(
+			"Frame %1 (timecode %2) in asset %3 has an instantaneous bit rate that is close to the limit of 250Mbit/s.",
+			note.frame().get(),
+			dcp::Time(note.frame().get(), note.frame_rate().get(), note.frame_rate().get()).as_string(dcp::Standard::SMPTE),
+			note.file()->filename()
+			);
 	case VerificationNote::Code::EXTERNAL_ASSET:
 		return String::compose("The asset %1 that this DCP refers to is not included in the DCP.  It may be a VF.", note.note().get());
 	case VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD:
@@ -1987,7 +2093,12 @@ dcp::note_to_string (VerificationNote note)
 	case VerificationNote::Code::PARTIALLY_ENCRYPTED:
 		return "Some assets are encrypted but some are not.";
 	case VerificationNote::Code::INVALID_JPEG2000_CODESTREAM:
-		return String::compose("The JPEG2000 codestream for at least one frame is invalid (%1).", note.note().get());
+		return String::compose(
+			"Frame %1 (timecode %2) has an invalid JPEG2000 codestream (%3).",
+			note.frame().get(),
+			dcp::Time(note.frame().get(), note.frame_rate().get(), note.frame_rate().get()).as_string(dcp::Standard::SMPTE),
+			note.note().get()
+			);
 	case VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K:
 		return String::compose("The JPEG2000 codestream uses %1 guard bits in a 2K image instead of 1.", note.note().get());
 	case VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_4K:
@@ -2062,6 +2173,16 @@ dcp::note_to_string (VerificationNote note)
 		return String::compose("The XML in the subtitle asset %1 has more than one namespace declaration.", note.note().get());
 	case VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT:
 		return String::compose("A subtitle or closed caption refers to a font with ID %1 that does not have a corresponding <LoadFont> node", note.id().get());
+	case VerificationNote::Code::MISSING_LOAD_FONT:
+		return String::compose("The SMPTE subtitle asset %1 has <Text> nodes but no <LoadFont> node", note.id().get());
+	case VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
+		return String::compose("The asset with ID %1 in the asset map actually has an id of %2", note.id().get(), note.other_id().get());
+	case VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
+		return String::compose("The <LabelText> in a <ContentVersion> in CPL %1 is empty", note.id().get());
+	case VerificationNote::Code::INVALID_CPL_NAMESPACE:
+		return String::compose("The namespace %1 in CPL %2 is invalid", note.note().get(), note.file()->filename());
+	case VerificationNote::Code::MISSING_CPL_CONTENT_VERSION:
+		return String::compose("The CPL %1 has no <ContentVersion> tag", note.note().get());
 	}
 
 	return "";
@@ -2071,7 +2192,19 @@ dcp::note_to_string (VerificationNote note)
 bool
 dcp::operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b)
 {
-	return a.type() == b.type() && a.code() == b.code() && a.note() == b.note() && a.file() == b.file() && a.line() == b.line();
+	return a.type() == b.type() &&
+		a.code() == b.code() &&
+		a.note() == b.note() &&
+		a.file() == b.file() &&
+		a.line() == b.line() &&
+		a.frame() == b.frame() &&
+		a.component() == b.component() &&
+		a.size() == b.size() &&
+		a.id() == b.id() &&
+		a.other_id() == b.other_id() &&
+		a.frame_rate() == b.frame_rate() &&
+		a.reference_hash() == b.reference_hash() &&
+		a.calculated_hash() == b.calculated_hash();
 }
 
 
@@ -2094,7 +2227,31 @@ dcp::operator< (dcp::VerificationNote const& a, dcp::VerificationNote const& b)
 		return a.file().get_value_or("") < b.file().get_value_or("");
 	}
 
-	return a.line().get_value_or(0) < b.line().get_value_or(0);
+	if (a.line() != b.line()) {
+		return a.line().get_value_or(0) < b.line().get_value_or(0);
+	}
+
+	if (a.frame() != b.frame()) {
+		return a.frame().get_value_or(0) < b.frame().get_value_or(0);
+	}
+
+	if (a.component() != b.component()) {
+		return a.component().get_value_or(0) < b.component().get_value_or(0);
+	}
+
+	if (a.size() != b.size()) {
+		return a.size().get_value_or(0) < b.size().get_value_or(0);
+	}
+
+	if (a.id() != b.id()) {
+		return a.id().get_value_or("") < b.id().get_value_or("");
+	}
+
+	if (a.other_id() != b.other_id()) {
+		return a.other_id().get_value_or("") < b.other_id().get_value_or("");
+	}
+
+	return a.frame_rate().get_value_or(0) != b.frame_rate().get_value_or(0);
 }