X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fverify_test.cc;h=b4019acd9f7191957531079c1e5d5586e577a889;hb=16a42e43922f3ae40dac6e0e4a8474439401b2c8;hp=a18058ef10968d0db40019e246fd620629b315fb;hpb=2aa794270a88d2e89b6a6dd86d9d16ce5ba0a954;p=libdcp.git

diff --git a/test/verify_test.cc b/test/verify_test.cc
index a18058ef..b4019acd 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -83,19 +83,49 @@ static string filename_to_id(boost::filesystem::path path)
 	return path.string().substr(4, path.string().length() - 8);
 }
 
-static boost::filesystem::path const dcp_test1_pkl = find_file("test/ref/DCP/dcp_test1", "pkl_").filename();
-static string const dcp_test1_pkl_id = filename_to_id(dcp_test1_pkl);
+static
+boost::filesystem::path
+dcp_test1_pkl()
+{
+	return find_file("test/ref/DCP/dcp_test1", "pkl_").filename();
+}
+
+static
+string
+dcp_test1_pkl_id()
+{
+	return filename_to_id(dcp_test1_pkl());
+}
 
-static boost::filesystem::path const dcp_test1_cpl = find_file("test/ref/DCP/dcp_test1", "cpl_").filename();
-static string const dcp_test1_cpl_id = filename_to_id(dcp_test1_cpl);
+static
+boost::filesystem::path
+dcp_test1_cpl()
+{
+	return find_file("test/ref/DCP/dcp_test1", "cpl_").filename();
+}
+
+static
+string
+dcp_test1_cpl_id()
+{
+	return filename_to_id(dcp_test1_cpl());
+}
 
 static string const dcp_test1_asset_map_id = "017b3de4-6dda-408d-b19b-6711354b0bc3";
 
-static boost::filesystem::path const encryption_test_cpl = find_file("test/ref/DCP/encryption_test", "cpl_").filename();
-static string const encryption_test_cpl_id = filename_to_id(encryption_test_cpl);
+static
+string
+encryption_test_cpl_id()
+{
+	return filename_to_id(find_file("test/ref/DCP/encryption_test", "cpl_").filename());
+}
 
-static boost::filesystem::path const encryption_test_pkl = find_file("test/ref/DCP/encryption_test", "pkl_").filename();
-static string const encryption_test_pkl_id = filename_to_id(encryption_test_pkl);
+static
+string
+encryption_test_pkl_id()
+{
+	return filename_to_id(find_file("test/ref/DCP/encryption_test", "pkl_").filename());
+}
 
 static void
 stage (string s, optional<path> p)
@@ -165,40 +195,77 @@ dump_notes (vector<dcp::VerificationNote> const & notes)
 LIBDCP_ENABLE_WARNINGS
 
 
+static
+string
+to_string(dcp::VerificationNote const& note)
+{
+	string s = note_to_string(note) + dcp::String::compose(
+		"\n  [%1 %2 %3 %4 %5 %6 ",
+		static_cast<int>(note.type()),
+		static_cast<int>(note.code()),
+		note.note().get_value_or("<none>"),
+		note.file().get_value_or("<none>"),
+		note.line().get_value_or(0),
+		note.frame().get_value_or(0)
+		);
+
+	s += dcp::String::compose(
+		"%1 %2 %3 %4 %5]\n",
+		note.id().get_value_or("<none>"),
+		note.other_id().get_value_or("<none>"),
+		note.cpl_id().get_value_or("<none>"),
+		note.reference_hash().get_value_or("<none>"),
+		note.calculated_hash().get_value_or("<none>")
+		);
+
+	return s;
+}
+
+
 static
 void
-check_verify_result (vector<path> dir, vector<dcp::VerificationNote> test_notes)
+check_verify_result(vector<dcp::VerificationNote> notes, vector<dcp::VerificationNote> test_notes)
 {
-	auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
-	std::sort (notes.begin(), notes.end());
-	std::sort (test_notes.begin(), test_notes.end());
+	std::sort(notes.begin(), notes.end());
+	std::sort(test_notes.begin(), test_notes.end());
 
-	string message = "\nVerification notes from test:\n";
-	for (auto i: notes) {
-		message += "  " + note_to_string(i) + "\n";
-		message += dcp::String::compose(
-			"  [%1 %2 %3 %4 %5]\n",
-			static_cast<int>(i.type()),
-			static_cast<int>(i.code()),
-			i.note().get_value_or("<none>"),
-			i.file().get_value_or("<none>"),
-			i.line().get_value_or(0)
-			);
+	string message = "\n";
+
+	vector<dcp::VerificationNote> not_expected;
+	for (auto note: notes) {
+		auto iter = std::find_if(test_notes.begin(), test_notes.end(), [note](dcp::VerificationNote const& n) { return note.type() == n.type() && note.code() == n.code(); });
+		if (iter != test_notes.end() && *iter != note) {
+			message += "Wrong details:\n --seen     " + to_string(note) + " --expected " + to_string(*iter) + "\n";
+		} else if (iter == test_notes.end()) {
+			not_expected.push_back(note);
+		}
 	}
-	message += "Expected:\n";
-	for (auto i: test_notes) {
-		message += "  " + note_to_string(i) + "\n";
-		message += dcp::String::compose(
-			"  [%1 %2 %3 %4 %5]\n",
-			static_cast<int>(i.type()),
-			static_cast<int>(i.code()),
-			i.note().get_value_or("<none>"),
-			i.file().get_value_or("<none>"),
-			i.line().get_value_or(0)
-			);
+
+	vector<dcp::VerificationNote> not_seen;
+	for (auto note: test_notes) {
+		auto iter = std::find_if(notes.begin(), notes.end(), [note](dcp::VerificationNote const& n) { return note.type() == n.type() && note.code() == n.code(); });
+		if (iter == notes.end()) {
+			not_seen.push_back(note);
+		}
 	}
 
-	BOOST_REQUIRE_MESSAGE (notes == test_notes, message);
+	for (auto note: not_expected) {
+		message += "Not expected:\n" + to_string(note) + "\n";
+	}
+
+	for (auto note: not_seen) {
+		message += "Not seen:\n" + to_string(note) + "\n";
+	}
+
+	BOOST_REQUIRE_MESSAGE(notes == test_notes, message);
+}
+
+
+static
+void
+check_verify_result(vector<path> dir, vector<dcp::DecryptedKDM> kdm, vector<dcp::VerificationNote> test_notes)
+{
+	check_verify_result(dcp::verify({dir}, kdm, &stage, &progress, {}, xsd_test).notes, test_notes);
 }
 
 
@@ -217,7 +284,7 @@ check_verify_result_after_replace (string suffix, boost::function<path (string)>
 		e.replace (from, to);
 	}
 
-	auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
+	auto notes = dcp::verify({dir}, {}, &stage, &progress, {}, xsd_test).notes;
 
 	BOOST_REQUIRE_EQUAL (notes.size(), codes.size());
 	auto i = notes.begin();
@@ -239,14 +306,36 @@ add_font(shared_ptr<dcp::SubtitleAsset> asset)
 }
 
 
+class HashCalculator
+{
+public:
+	HashCalculator(boost::filesystem::path path)
+		: _path(path)
+		, _old_hash(dcp::make_digest(path, [](int64_t, int64_t) {}))
+	{}
+
+	std::string old_hash() const {
+		return _old_hash;
+	}
+
+	std::string new_hash() const {
+		return dcp::make_digest(_path, [](int64_t, int64_t) {});
+	}
+
+private:
+	boost::filesystem::path _path;
+	std::string _old_hash;
+};
+
+
 BOOST_AUTO_TEST_CASE (verify_no_error)
 {
 	stages.clear ();
 	auto dir = setup (1, "no_error");
-	auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
+	auto notes = dcp::verify({dir}, {}, &stage, &progress, {}, xsd_test).notes;
 
-	path const cpl_file = dir / dcp_test1_cpl;
-	path const pkl_file = dir / dcp_test1_pkl;
+	path const cpl_file = dir / dcp_test1_cpl();
+	path const pkl_file = dir / dcp_test1_pkl();
 	path const assetmap_file = dir / "ASSETMAP.xml";
 
 	auto st = stages.begin();
@@ -280,8 +369,7 @@ BOOST_AUTO_TEST_CASE (verify_no_error)
 	BOOST_CHECK_EQUAL (st->first, "Checking PKL");
 	BOOST_REQUIRE (st->second);
 	BOOST_CHECK_EQUAL (st->second.get(), canonical(pkl_file));
-	++st;
-	BOOST_CHECK_EQUAL (st->first, "Checking ASSETMAP");
+	++st; BOOST_CHECK_EQUAL (st->first, "Checking ASSETMAP");
 	BOOST_REQUIRE (st->second);
 	BOOST_CHECK_EQUAL (st->second.get(), canonical(assetmap_file));
 	++st;
@@ -298,26 +386,33 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
 	auto dir = setup (1, "incorrect_picture_sound_hash");
 
 	auto video_path = path(dir / "video.mxf");
+	HashCalculator video_calc(video_path);
 	auto mod = fopen(video_path.string().c_str(), "r+b");
 	BOOST_REQUIRE (mod);
-	fseek (mod, 4096, SEEK_SET);
+	BOOST_REQUIRE_EQUAL(fseek(mod, -16, SEEK_END), 0);
 	int x = 42;
-	fwrite (&x, sizeof(x), 1, mod);
+	BOOST_REQUIRE(fwrite(&x, sizeof(x), 1, mod) == 1);
 	fclose (mod);
 
 	auto audio_path = path(dir / "audio.mxf");
+	HashCalculator audio_calc(audio_path);
 	mod = fopen(audio_path.string().c_str(), "r+b");
 	BOOST_REQUIRE (mod);
-	BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0);
+	BOOST_REQUIRE_EQUAL(fseek(mod, 0, SEEK_END), 0);
 	BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
 	fclose (mod);
 
 	dcp::ASDCPErrorSuspender sus;
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_PICTURE_HASH, canonical(video_path) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_SOUND_HASH, canonical(audio_path) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_PICTURE_HASH, canonical(video_path)
+				).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(video_calc.old_hash()).set_calculated_hash(video_calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_SOUND_HASH, canonical(audio_path)
+				).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(audio_calc.old_hash()).set_calculated_hash(audio_calc.new_hash()),
 		});
 }
 
@@ -328,20 +423,29 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 
 	auto dir = setup (1, "mismatched_picture_sound_hashes");
 
+	HashCalculator calc(dir / dcp_test1_cpl());
+
 	{
-		Editor e (dir / dcp_test1_pkl);
+		Editor e (dir / dcp_test1_pkl());
 		e.replace ("<Hash>", "<Hash>x");
 	}
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 28 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xtfX1mVIKJCVr1m7Y32Nzxf0+Rpw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xwUmt8G+cFFKMGt0ueS9+F1S4uhc=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 20 },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
+				).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash("x" + calc.old_hash()).set_calculated_hash(calc.old_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf")
+				).set_cpl_id(dcp_test1_cpl_id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf")
+				).set_cpl_id(dcp_test1_cpl_id()),
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x3M7YTgvFKXXMEGLkIbV4miC90FE=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xskI+5b/9LA/y6h0mcyxysJYanxI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xvsVjRV9vhTBPUWfE/TT1o2vdQsI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
 		});
 }
 
@@ -350,16 +454,23 @@ BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
 {
 	auto dir = setup (1, "failed_read_content_kind");
 
+	HashCalculator calc(dir / dcp_test1_cpl());
+
 	{
-		Editor e (dir / dcp_test1_cpl);
+		Editor e (dir / dcp_test1_cpl());
 		e.replace ("<ContentKind>", "<ContentKind>x");
 	}
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("xtrailer") }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
+				).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("xtrailer")
+				).set_cpl_id(dcp_test1_cpl_id())
 		});
 }
 
@@ -368,7 +479,7 @@ static
 path
 cpl (string suffix)
 {
-	return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_cpl);
+	return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_cpl());
 }
 
 
@@ -376,7 +487,7 @@ static
 path
 pkl (string suffix)
 {
-	return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_pkl);
+	return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_pkl());
 }
 
 
@@ -404,6 +515,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_asset)
 	remove (dir / "video.mxf");
 	check_verify_result (
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_ASSET, canonical(dir) / "video.mxf" }
 		});
@@ -462,8 +574,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 {
 	check_verify_result_after_replace (
 		"invalid_xml_pkl_id", &pkl,
-		"<Id>urn:uuid:" + dcp_test1_pkl_id.substr(0, 3),
-		"<Id>urn:uuid:x" + dcp_test1_pkl_id.substr(1, 2),
+		"<Id>urn:uuid:" + dcp_test1_pkl_id().substr(0, 3),
+		"<Id>urn:uuid:x" + dcp_test1_pkl_id().substr(1, 2),
 		{ dcp::VerificationNote::Code::INVALID_XML }
 		);
 }
@@ -484,7 +596,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
 {
 	stages.clear ();
 	auto dir = setup (3, "verify_invalid_standard");
-	auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
+	auto notes = dcp::verify({dir}, {}, &stage, &progress, {}, xsd_test).notes;
 
 	path const cpl_file = dir / "cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
 	path const pkl_file = dir / "pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
@@ -528,13 +640,16 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
 	++st;
 	BOOST_REQUIRE (st == stages.end());
 
-	BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+	BOOST_REQUIRE_EQUAL(notes.size(), 25U);
 	auto i = notes.begin ();
 	BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
 	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_STANDARD);
 	++i;
-	BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
-	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K);
+	for (int j = 0; j < 24; ++j) {
+		BOOST_CHECK_EQUAL(i->type(), dcp::VerificationNote::Type::BV21_ERROR);
+		BOOST_CHECK_EQUAL(i->code(), dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K);
+		++i;
+	}
 }
 
 /* DCP with a short asset */
@@ -547,21 +662,36 @@ BOOST_AUTO_TEST_CASE (verify_invalid_duration)
 	BOOST_REQUIRE(dcp.cpls().size() == 1);
 	auto cpl = dcp.cpls()[0];
 
-	check_verify_result (
-		{ dir },
-		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2") },
+	vector<dcp::VerificationNote> expected = {
+		{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91")
+			).set_cpl_id(cpl->id()),
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91")
+			).set_cpl_id(cpl->id()),
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626")
+			).set_cpl_id(cpl->id()),
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626")
+			).set_cpl_id(cpl->id()),
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::WARNING,
+			dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT,
+			cpl->file().get()
+			).set_cpl_id(cpl->id())
+	};
+
+	for (int i = 0; i < 23; ++i) {
+		expected.push_back(
 			dcp::VerificationNote(
-				dcp::VerificationNote::Type::WARNING,
-				dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT,
-				cpl->file().get()
-			).set_id("d74fda30-d5f4-4c5f-870f-ebc089d97eb7")
-		});
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2")
+				).set_cpl_id(cpl->id())
+			);
+	}
+
+	check_verify_result({ dir }, {}, expected);
 }
 
 
@@ -600,13 +730,30 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
 	prepare_directory (dir);
 	auto cpl = dcp_from_frame (oversized_frame, dir);
 
-	check_verify_result (
-		{ dir },
-		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
-		});
+	vector<dcp::VerificationNote> expected;
+	for (auto i = 0; i < 24; ++i) {
+		expected.push_back(
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte")
+				).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
+			);
+	}
+
+	for (auto i = 0; i < 24; ++i) {
+		expected.push_back(
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf")
+				).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
+			);
+	}
+
+	expected.push_back(
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+			).set_cpl_id(cpl->id())
+		);
+
+	check_verify_result({ dir }, {}, expected);
 }
 
 
@@ -628,13 +775,31 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
 	prepare_directory (dir);
 	auto cpl = dcp_from_frame (oversized_frame, dir);
 
-	check_verify_result (
-		{ dir },
-		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
-		});
+	vector<dcp::VerificationNote> expected;
+
+	for (auto i = 0; i < 24; ++i) {
+		expected.push_back(
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte")
+				).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
+			);
+	}
+
+	for (auto i = 0; i < 24; ++i) {
+		expected.push_back(
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf")
+				).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
+		);
+	}
+
+	expected.push_back(
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+			).set_cpl_id(cpl->id())
+		);
+
+	check_verify_result ({ dir }, {}, expected);
 }
 
 
@@ -649,7 +814,11 @@ BOOST_AUTO_TEST_CASE (verify_valid_picture_frame_size_in_bytes)
 	prepare_directory (dir);
 	auto cpl = dcp_from_frame (frame, dir);
 
-	check_verify_result ({ dir }, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result(
+		{ dir },
+		{},
+		{ dcp::VerificationNote(dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id()) }
+		);
 }
 
 
@@ -660,12 +829,16 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
-		{dir}, {
+		{dir},
+		{},
+		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -677,12 +850,16 @@ BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
 	copy_file("test/data/subs1.xml", dir / "ccap.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "ccap.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
-		{dir}, {
+		{dir},
+		{},
+		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -696,7 +873,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	{
 		Editor e (dir / "subs.xml");
@@ -705,17 +882,22 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5 },
-			{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR,
 				dcp::VerificationNote::Code::INVALID_XML,
 				string("element 'Foo' is not allowed for content model '(SubtitleID,MovieTitle,ReelNumber,Language,LoadFont*,Font*,Subtitle*)'"),
 				path(),
 				29
-			},
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -727,14 +909,19 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
 	copy_file("test/data/subs4.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get())
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
 		});
 
 }
@@ -747,13 +934,16 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
 	copy_file("test/data/subs5.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"}
+				).set_cpl_id(cpl->id())
 		});
 
 }
@@ -770,10 +960,17 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 
 	check_verify_result(
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"} },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"}
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+				).set_cpl_id(cpl->id()),
 		});
 }
 
@@ -792,19 +989,30 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2 },
-			{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR,
 				dcp::VerificationNote::Code::INVALID_XML,
 				string("element 'Foo' is not allowed for content model '(Id,ContentTitleText,AnnotationText?,IssueDate,ReelNumber?,Language?,EditRate,TimeCodeRate,StartTime?,DisplayType?,LoadFont*,SubtitleList)'"),
 				path(),
 				2
-			},
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2020-05-09T00:29:21.000+02:00"} },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2020-05-09T00:29:21.000+02:00"}
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+				).set_cpl_id(cpl->id()),
 		});
 }
 
@@ -820,13 +1028,26 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-08-09T18:34:46.000+02:00"} },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-08-09T18:34:46.000+02:00"}
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -843,9 +1064,12 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_child_nodes)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -862,11 +1086,18 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get())
+				).set_cpl_id(cpl->id()),
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -892,9 +1123,12 @@ BOOST_AUTO_TEST_CASE (verify_external_asset)
 
 	check_verify_result (
 		{ vf_dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, picture->asset()->id() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -986,6 +1220,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 	dcp.set_annotation_text("hello");
 	dcp.write_xml();
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e (find_cpl(dir));
 		e.replace ("MainSound", "MainSoundX");
@@ -993,10 +1229,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 50 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 51 },
-			{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 50
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 51
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR,
 				dcp::VerificationNote::Code::INVALID_XML,
 				string("element 'meta:MainSoundXConfiguration' is not allowed for content model "
@@ -1006,9 +1247,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 				       "MainSoundSampleRate,MainPictureStoredArea,MainPictureActiveArea,MainSubtitleLanguageList?,"
 				       "ExtensionMetadataList?,)'"),
 				canonical(cpl->file().get()),
-				71
-			},
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) },
+				71).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
 		});
 }
 
@@ -1040,6 +1282,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("missing XML tag Width in MainPictureStoredArea") }}
 		);
 }
@@ -1059,10 +1302,17 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1082,10 +1332,17 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1124,11 +1381,20 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("this-is-wrong") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("andso-is-this") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("fred-jim") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("frobozz") },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("this-is-wrong")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("andso-is-this")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("fred-jim")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("frobozz")
+				).set_cpl_id(cpl->id()),
 		});
 }
 
@@ -1184,7 +1450,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	d->set_annotation_text("A Test DCP");
 	d->write_xml();
 
-	return dcp::verify({dcp_path}, &stage, &progress, {}, xsd_test);
+	return dcp::verify({dcp_path}, {}, &stage, &progress, {}, xsd_test).notes;
 }
 
 
@@ -1305,7 +1571,8 @@ add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int en
 			dcp::Colour(),
 			dcp::Time(),
 			dcp::Time(),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 		)
 	);
 }
@@ -1328,16 +1595,23 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR,
 				dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
 				string("419371"),
 				canonical(dir / "subs.mxf")
-			},
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1372,12 +1646,23 @@ verify_timed_text_asset_too_large (string name)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121698284"), canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1424,14 +1709,20 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-	dcp->cpls()[0]->reels()[0]->add(reel_subs);
+	auto cpl = dcp->cpls()[0];
+	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1467,10 +1758,17 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 
 	check_verify_result (
 		{ path },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES
+				).set_cpl_id(cpl->id()),
 		});
 }
 
@@ -1506,9 +1804,14 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 
 	check_verify_result (
 		{ path },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf")
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1548,14 +1851,20 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-	dcp->cpls()[0]->reels()[0]->add(reel_subs);
+	auto cpl = dcp->cpls()[0];
+	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1596,14 +1905,20 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-	dcp->cpls().front()->reels().front()->add(reel_subs);
+	auto cpl = dcp->cpls()[0];
+	cpl->reels().front()->add(reel_subs);
 	dcp->write_xml();
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1629,7 +1944,7 @@ public:
 
 template <class T>
 shared_ptr<dcp::CPL>
-dcp_with_text (path dir, vector<TestText> subs)
+dcp_with_text(path dir, vector<TestText> subs, optional<dcp::Key> key = boost::none, optional<string> key_id = boost::none)
 {
 	prepare_directory (dir);
 	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
@@ -1638,6 +1953,10 @@ dcp_with_text (path dir, vector<TestText> subs)
 		add_test_subtitle (asset, i.in, i.out, i.v_position, i.v_align, i.text);
 	}
 	asset->set_language (dcp::LanguageTag("de-DE"));
+	if (key && key_id) {
+		asset->set_key(*key);
+		asset->set_key_id(*key_id);
+	}
 	add_font(asset);
 	asset->write (dir / "subs.mxf");
 
@@ -1690,9 +2009,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 
 }
@@ -1703,7 +2027,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
 	auto const dir = path("build/test/verify_valid_subtitle_first_text_time");
 	/* Just late enough */
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1748,7 +2079,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	dcp->set_annotation_text("hello");
 	dcp->write_xml();
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1763,9 +2101,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1779,7 +2122,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 			{ 4 * 24,      5 * 24 },
 			{ 5 * 24 + 16, 8 * 24 },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1789,9 +2140,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1800,7 +2156,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_duration");
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1819,11 +2183,20 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "72 96", boost::filesystem::canonical(asset->file().get()) },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "72 96", boost::filesystem::canonical(asset->file().get())
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 
 }
@@ -1842,9 +2215,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1859,7 +2237,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
 			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1876,9 +2262,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1894,7 +2285,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
 			{ 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1908,9 +2307,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1925,9 +2329,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1945,9 +2354,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1962,7 +2376,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
 			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1979,9 +2401,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -1997,7 +2424,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
 			{ 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -2009,10 +2444,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
 		});
+
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2027,9 +2466,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2046,8 +2490,11 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2064,9 +2511,14 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
 		});
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2081,10 +2533,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
 			{ 96, 300, 0.1, dcp::VAlign::TOP, "is" },
 			{ 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
 		});
-	check_verify_result (
+
+	check_verify_result(
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2099,10 +2555,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
 			{ 96, 300, 0.1, dcp::VAlign::BOTTOM, "is" },
 			{ 96, 300, 0.0, dcp::VAlign::BOTTOM, "also fine" },
 		});
-	check_verify_result (
+
+	check_verify_result(
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2113,9 +2573,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
 	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2124,10 +2589,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering4)
 {
 	auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering4");
 	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
-	check_verify_result (
+
+	check_verify_result(
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2155,9 +2624,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf")
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2172,6 +2646,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		BOOST_REQUIRE (cpl->file());
 		Editor e(cpl->file().get());
@@ -2180,9 +2656,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
 		});
 }
 
@@ -2196,6 +2677,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 	BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		BOOST_REQUIRE (cpl->file());
 		Editor e(cpl->file().get());
@@ -2204,9 +2687,14 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+				).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2235,9 +2723,14 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), canonical(cpl->file().get()) }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl->file().get())
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2306,9 +2799,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 		auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, true, false);
 		check_verify_result (
 			{ dir },
+			{},
 			{
-				{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS },
-				{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS
+					).set_cpl_id(cpl->id()),
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
 			});
 
 	}
@@ -2316,13 +2814,27 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 	{
 		path dir ("build/test/verify_subtitles_must_be_in_all_reels2");
 		auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, true, true);
-		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result(
+			{dir},
+			{},
+			{
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
+			});
 	}
 
 	{
 		path dir ("build/test/verify_subtitles_must_be_in_all_reels1");
 		auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, false, false);
-		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result(
+			{dir},
+			{},
+			{
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
+			});
 	}
 }
 
@@ -2389,22 +2901,41 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 		auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 3, 4);
 		check_verify_result (
 			{dir},
+			{},
 			{
-				{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS },
-				{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS
+					).set_cpl_id(cpl->id()),
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
 			});
 	}
 
 	{
 		path dir ("build/test/verify_closed_captions_must_be_in_all_reels2");
 		auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 4, 4);
-		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result(
+			{dir},
+			{},
+			{
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
+			});
 	}
 
 	{
 		path dir ("build/test/verify_closed_captions_must_be_in_all_reels3");
 		auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 0, 0);
-		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result(
+			{dir},
+			{},
+			{
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+					).set_cpl_id(cpl->id())
+			});
 	}
 }
 
@@ -2445,9 +2976,14 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, code, subs->id() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, code, subs->id()
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2502,6 +3038,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 	BOOST_REQUIRE (cpl->reels()[0]->main_picture());
 	auto asset_id = cpl->reels()[0]->main_picture()->id();
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		BOOST_REQUIRE (cpl->file());
 		Editor e(cpl->file().get());
@@ -2510,9 +3048,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, asset_id }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, asset_id
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2526,15 +3069,20 @@ verify_markers_test (
 	)
 {
 	auto dcp = make_simple (dir);
-	dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
+	auto cpl = dcp->cpls()[0];
+	cpl->set_content_kind(dcp::ContentKind::FEATURE);
 	auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24);
 	for (auto const& i: markers) {
 		markers_asset->set (i.first, i.second);
 	}
-	dcp->cpls()[0]->reels()[0]->add(markers_asset);
+	cpl->reels()[0]->add(markers_asset);
 	dcp->write_xml();
 
-	check_verify_result ({dir}, test_notes);
+	for (auto& note: test_notes) {
+		note.set_cpl_id(cpl->id());
+	}
+
+	check_verify_result({dir}, {}, test_notes);
 }
 
 
@@ -2630,7 +3178,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 	cpl->unset_version_number();
 	dcp->write_xml();
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
+	check_verify_result(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -2643,6 +3198,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 	BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.delete_lines ("<meta:ExtensionMetadataList>", "</meta:ExtensionMetadataList>");
@@ -2650,9 +3207,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2665,6 +3227,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.delete_lines ("<meta:ExtensionMetadata scope=\"http://isdcf.com/ns/cplmd/app\">", "</meta:ExtensionMetadata>");
@@ -2672,9 +3236,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2687,6 +3256,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Name>A", "<meta:NameX>A");
@@ -2695,10 +3266,16 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 70 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 70
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
 		});
 }
 
@@ -2711,6 +3288,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("Application", "Fred");
@@ -2718,9 +3297,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2733,6 +3317,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("DCP Constraints Profile", "Fred");
@@ -2740,9 +3326,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2755,6 +3346,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Value>", "<meta:ValueX>");
@@ -2763,10 +3356,17 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 74 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 75 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 74
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 75
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
 		});
 }
 
@@ -2779,6 +3379,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("SMPTE-RDD-52:2020-Bv2.1", "Fred");
@@ -2786,9 +3388,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Value> property should be 'SMPTE-RDD-52:2020-Bv2.1'"), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Value> property should be 'SMPTE-RDD-52:2020-Bv2.1'"), cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2801,6 +3408,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Property>", "<meta:PropertyX>");
@@ -2809,10 +3418,16 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 72 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 76 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 72
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 76).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
 		});
 }
 
@@ -2825,6 +3440,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:PropertyList>", "<meta:PropertyListX>");
@@ -2833,10 +3450,17 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 71 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 71
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+				).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
 		});
 }
 
@@ -2850,25 +3474,46 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
 		copy_file (i.path(), dir / i.path().filename());
 	}
 
-	path const pkl = dir / ( "pkl_" + encryption_test_pkl_id + ".xml" );
-	path const cpl = dir / ( "cpl_" + encryption_test_cpl_id + ".xml");
+	path const pkl = dir / ( "pkl_" + encryption_test_pkl_id() + ".xml");
+	path const cpl_path = dir / ( "cpl_" + encryption_test_cpl_id() + ".xml");
+
+	HashCalculator calc(cpl_path);
 
 	{
-		Editor e (cpl);
+		Editor e(cpl_path);
 		e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
 	}
 
+	dcp::CPL cpl(cpl_path);
+
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, encryption_test_cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id, canonical(pkl), },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, encryption_test_cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, encryption_test_cpl_id, canonical(cpl) }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl_path)
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl)
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_path)
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, canonical(cpl_path)
+				).set_cpl_id(cpl.id())
 		});
 }
 
@@ -2881,23 +3526,40 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
 		copy_file (i.path(), dir / i.path().filename());
 	}
 
-	path const cpl = dir / ("cpl_" + encryption_test_cpl_id + ".xml");
-	path const pkl = dir / ("pkl_" + encryption_test_pkl_id + ".xml");
+	path const cpl_path = dir / ("cpl_" + encryption_test_cpl_id() + ".xml");
+	path const pkl = dir / ("pkl_" + encryption_test_pkl_id() + ".xml");
 	{
 		Editor e (pkl);
 		e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
 	}
 
+	dcp::CPL cpl(cpl_path);
+
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id, canonical(pkl) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, encryption_test_cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, encryption_test_pkl_id, canonical(pkl) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl)
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_path)
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, encryption_test_pkl_id(), canonical(pkl)
+				)
 		});
 }
 
@@ -2911,11 +3573,11 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_unencrypted_content)
 	}
 
 	{
-		Editor e (dir / dcp_test1_pkl);
+		Editor e (dir / dcp_test1_pkl());
 		e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
 	}
 
-	check_verify_result ({dir}, {});
+	check_verify_result({dir}, {}, {});
 }
 
 
@@ -2980,8 +3642,11 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
 	check_verify_result (
 		{dir},
+		{},
 		{
-			{dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED},
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -2992,7 +3657,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_2k)
 	dcp::MonoPictureAsset picture (find_file(private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV", "j2c.mxf"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
-	verify_j2k(frame, 0, 24, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -3003,7 +3668,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_4k)
 	dcp::MonoPictureAsset picture (find_file(private_test / "data" / "sul", "TLR"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
-	verify_j2k(frame, 0, 24, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -3018,7 +3683,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_libdcp)
 	dcp::MonoPictureAsset picture (find_file(dir, "video"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
-	verify_j2k(frame, 0, 24, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -3079,11 +3744,20 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf)
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3144,12 +3818,23 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2018-10-02T12:25:14+02:00"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf)
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2018-10-02T12:25:14+02:00"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3157,17 +3842,20 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 /** Check a DCP with a 3D asset marked as 2D */
 BOOST_AUTO_TEST_CASE (verify_threed_marked_as_twod)
 {
+	auto const path = private_test / "data" / "xm";
+
 	check_verify_result (
-		{ private_test / "data" / "xm" },
+		{ path },
+		{},
 		{
-			{
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::WARNING,
-				dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, boost::filesystem::canonical(find_file(private_test / "data" / "xm", "j2c"))
-			},
-			{
+				dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, boost::filesystem::canonical(find_file(path, "j2c"))
+				),
+			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR,
 				dcp::VerificationNote::Code::INVALID_STANDARD
-			},
+				)
 		});
 
 }
@@ -3180,6 +3868,8 @@ BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
 	auto dcp = make_simple (dir, 1, 24);
 	dcp->write_xml();
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e (find_cpl(dir));
 		e.insert(
@@ -3192,10 +3882,17 @@ BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION
+				).set_cpl_id(cpl.id())
 		});
 }
 
@@ -3207,6 +3904,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
 	auto dcp = make_simple (dir, 1, 24);
 	dcp->write_xml();
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e(find_cpl(dir));
 		e.replace("trailer", "trip");
@@ -3216,9 +3915,14 @@ BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("trip") }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("trip")
+				).set_cpl_id(cpl.id()),
 		});
 
 }
@@ -3231,6 +3935,8 @@ BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
 	auto dcp = make_simple (dir, 1, 24);
 	dcp->write_xml();
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e(find_cpl(dir));
 		e.replace("<ContentKind>trailer</ContentKind>", "<ContentKind scope=\"http://bobs.contents/\">trip</ContentKind>");
@@ -3240,10 +3946,12 @@ BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
 		});
-
 }
 
 
@@ -3256,6 +3964,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
 
 	auto constexpr area = "<meta:MainPictureActiveArea>";
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e(find_cpl(dir));
 		e.delete_lines_after(area, 2);
@@ -3268,10 +3978,17 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
 
 	check_verify_result(
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 1997 is not a multiple of 2", canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 4080 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 1997 is not a multiple of 2", canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 4080 is bigger than the asset height 1080", canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()),
 		});
 }
 
@@ -3285,6 +4002,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
 
 	auto constexpr area = "<meta:MainPictureActiveArea>";
 
+	HashCalculator calc(find_cpl(dir));
+
 	{
 		Editor e(find_cpl(dir));
 		e.delete_lines_after(area, 2);
@@ -3297,11 +4016,20 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
 
 	check_verify_result(
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is not a multiple of 2", canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 9900 is bigger than the asset width 1998", canonical(find_cpl(dir)) },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is not a multiple of 2", canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 9900 is bigger than the asset width 1998", canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is bigger than the asset height 1080", canonical(find_cpl(dir))
+				).set_cpl_id(cpl.id())
 		});
 }
 
@@ -3324,6 +4052,7 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_pkl_asset_ids)
 
 	check_verify_result(
 		{ dir },
+		{},
 		{
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl.id(), canonical(find_pkl(dir)) },
 		});
@@ -3346,12 +4075,18 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids)
 
 	dcp::PKL pkl(find_pkl(dir));
 	dcp::AssetMap asset_map(find_asset_map(dir));
+	dcp::CPL cpl(find_cpl(dir));
 
 	check_verify_result(
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir)) },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54") },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir))
+				),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54")
+				)
 		});
 }
 
@@ -3422,8 +4157,11 @@ BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
 
 	check_verify_result(
 		{ path },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2")) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2"))
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3472,8 +4210,11 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
 
 	check_verify_result(
 		{ path },
+		{},
 		{
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION, std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"}, canonical(find_cpl(path)) },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION, std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"}, canonical(find_cpl(path))
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3528,29 +4269,78 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 	dcp->set_annotation_text("A Test DCP");
 	dcp->write_xml();
 
-	check_verify_result(
-		{ path },
-		{
-			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE).set_frame(0).set_component(0).set_size(1321721),
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(path / "video.mxf") },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
-		});
+	vector<dcp::VerificationNote> expected;
+
+	for (auto frame = 0; frame < 24; frame++) {
+		expected.push_back(
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(path / "video.mxf")
+			).set_frame(frame).set_frame_rate(24).set_cpl_id(cpl->id())
+		);
+	}
+
+	int component_sizes[] = {
+		1321816,
+		1294414,
+		1289881,
+	};
+
+	for (auto frame = 0; frame < 24; frame++) {
+		for (auto component = 0; component < 3; component++) {
+			expected.push_back(
+				dcp::VerificationNote(
+					dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE
+					).set_frame(frame).set_component(component).set_size(component_sizes[component]).set_cpl_id(cpl->id())
+				);
+		}
+	}
+
+	expected.push_back(
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+			).set_cpl_id(cpl->id())
+	);
+
+	expected.push_back(
+		dcp::VerificationNote(
+			dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+			).set_cpl_id(cpl->id())
+	);
+
+	check_verify_result({ path }, {}, expected);
 }
 
 
 BOOST_AUTO_TEST_CASE(verify_too_many_subtitle_namespaces)
 {
 	boost::filesystem::path const dir = "test/ref/DCP/subtitle_namespace_test";
+	dcp::DCP dcp(dir);
+	dcp.read();
+	BOOST_REQUIRE(!dcp.cpls().empty());
+	auto cpl = dcp.cpls()[0];
+
 	check_verify_result(
 		{ dir },
+		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(find_file(dir, "sub_")) },
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, "fc815694-7977-4a27-a8b3-32b9d4075e4c", canonical(find_file(dir, "cpl_")) },
-			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, std::string{"315de731-1173-484c-9a35-bdacf5a9d99d"} }
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(find_file(dir, "sub_"))
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(find_file(dir, "cpl_"))
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, std::string{"315de731-1173-484c-9a35-bdacf5a9d99d"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3566,12 +4356,14 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
 	}
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
-		{dir}, {
+		{dir},
+		{},
+		{
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId")
+			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId").set_cpl_id(cpl->id())
 		});
 
 }
@@ -3612,13 +4404,15 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 	subs->write(dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);
-	dcp->cpls()[0]->reels()[0]->add(reel_subs);
+	auto cpl = dcp->cpls()[0];
+	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
-			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id())
+			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id()).set_cpl_id(cpl->id())
 		});
 }
 
@@ -3642,6 +4436,7 @@ BOOST_AUTO_TEST_CASE(verify_spots_wrong_asset)
 
 	check_verify_result(
 		{dir / "1"},
+		{},
 		{
 			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_MAP_ID).set_id(asset_1).set_other_id(asset_2)
 		});
@@ -3661,7 +4456,41 @@ BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
 
 	check_verify_result(
 		{dir},
+		{},
 		{
-			dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_id(cpl->id())
+			dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_cpl_id(cpl->id())
 		});
 }
+
+
+/** Check that we don't get any strange errors when verifying encrypted DCPs (DoM #2659) */
+BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp)
+{
+	auto const dir = path("build/test/verify_encrypted_smpte_dcp");
+	dcp::Key key;
+	auto key_id = dcp::make_uuid();
+	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset>(dir, {{ 4 * 24, 5 * 24 }}, key, key_id);
+
+	dcp::DecryptedKDM kdm(dcp::LocalTime(), dcp::LocalTime(), "", "", "");
+	kdm.add_key(dcp::DecryptedKDMKey(string{"MDIK"}, key_id, key, cpl->id(), dcp::Standard::SMPTE));
+
+	path const pkl_file = find_file(dir, "pkl_");
+	path const cpl_file = find_file(dir, "cpl_");
+
+	check_verify_result(
+		{ dir },
+		{ kdm },
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_file)
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, canonical(cpl_file)
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, filename_to_id(pkl_file.filename()), canonical(pkl_file)
+				)
+		});
+}
+
+