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

diff --git a/test/verify_test.cc b/test/verify_test.cc
index b4db6c5c..b4019acd 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -31,9 +31,11 @@
     files in the program, then also delete it here.
 */
 
+
 #include "compose.hpp"
 #include "cpl.h"
 #include "dcp.h"
+#include "file.h"
 #include "interop_subtitle_asset.h"
 #include "j2k_transcode.h"
 #include "mono_picture_asset.h"
@@ -56,21 +58,22 @@
 #include "util.h"
 #include "verify.h"
 #include "verify_j2k.h"
-#include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/random.hpp>
+#include <boost/test/unit_test.hpp>
 #include <cstdio>
 #include <iostream>
 
 
 using std::list;
+using std::make_pair;
+using std::make_shared;
 using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::make_pair;
-using std::make_shared;
 using boost::optional;
 using namespace boost::filesystem;
-using std::shared_ptr;
 
 
 static list<pair<string, optional<path>>> stages;
@@ -80,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
+dcp_test1_cpl()
+{
+	return find_file("test/ref/DCP/dcp_test1", "cpl_").filename();
+}
 
-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
+string
+dcp_test1_cpl_id()
+{
+	return filename_to_id(dcp_test1_cpl());
+}
 
-static string const dcp_test1_asset_map_id = "5d51e8a1-b2a5-4da6-9b66-4615c3609440";
+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)
@@ -115,6 +148,9 @@ prepare_directory (path path)
 }
 
 
+/** Copy dcp_test{reference_number} to build/test/verify_test{verify_test_suffix}
+ *  to make a new sacrificial test DCP.
+ */
 static path
 setup (int reference_number, string verify_test_suffix)
 {
@@ -140,88 +176,13 @@ write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dc
 	cpl->add (reel);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp->set_annotation_text("hello");
+	dcp->write_xml ();
 
 	return cpl;
 }
 
 
-/** Class that can alter a file by searching and replacing strings within it.
- *  On destruction modifies the file whose name was given to the constructor.
- */
-class Editor
-{
-public:
-	Editor (path path)
-		: _path(path)
-	{
-		_content = dcp::file_to_string (_path);
-	}
-
-	~Editor ()
-	{
-		auto f = fopen(_path.string().c_str(), "w");
-		BOOST_REQUIRE (f);
-		fwrite (_content.c_str(), _content.length(), 1, f);
-		fclose (f);
-	}
-
-	void replace (string a, string b)
-	{
-		auto old_content = _content;
-		boost::algorithm::replace_all (_content, a, b);
-		BOOST_REQUIRE (_content != old_content);
-	}
-
-	void delete_first_line_containing (string s)
-	{
-		vector<string> lines;
-		boost::algorithm::split (lines, _content, boost::is_any_of("\r\n"), boost::token_compress_on);
-		auto old_content = _content;
-		_content = "";
-		bool done = false;
-		for (auto i: lines) {
-			if (i.find(s) == string::npos || done) {
-				_content += i + "\n";
-			} else {
-				done = true;
-			}
-		}
-		BOOST_REQUIRE (_content != old_content);
-	}
-
-	void delete_lines (string from, string to)
-	{
-		vector<string> lines;
-		boost::algorithm::split (lines, _content, boost::is_any_of("\r\n"), boost::token_compress_on);
-		bool deleting = false;
-		auto old_content = _content;
-		_content = "";
-		for (auto i: lines) {
-			if (i.find(from) != string::npos) {
-				deleting = true;
-			}
-			if (!deleting) {
-				_content += i + "\n";
-			}
-			if (deleting && i.find(to) != string::npos) {
-				deleting = false;
-			}
-		}
-		BOOST_REQUIRE (_content != old_content);
-	}
-
-private:
-	path _path;
-	std::string _content;
-};
-
-
 LIBDCP_DISABLE_WARNINGS
 static
 void
@@ -234,27 +195,84 @@ 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 = "\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);
+		}
+	}
 
-	string message = "\nVerification notes from test:\n";
-	for (auto i: notes) {
-		message += "  " + note_to_string(i) + "\n";
+	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);
+		}
+	}
+
+	for (auto note: not_expected) {
+		message += "Not expected:\n" + to_string(note) + "\n";
 	}
-	message += "Expected:\n";
-	for (auto i: test_notes) {
-		message += "  " + note_to_string(i) + "\n";
+
+	for (auto note: not_seen) {
+		message += "Not seen:\n" + to_string(note) + "\n";
 	}
 
-	BOOST_REQUIRE_MESSAGE (notes == test_notes, message);
+	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);
 }
 
 
+/* Copy dcp_test1 to build/test/verify_test{suffix} then edit a file found by the functor 'file',
+ * replacing from with to.  Verify the resulting DCP and check that the results match the given
+ * list of codes.
+ */
 static
 void
 check_verify_result_after_replace (string suffix, boost::function<path (string)> file, string from, string to, vector<dcp::VerificationNote::Code> codes)
@@ -266,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();
@@ -279,14 +297,45 @@ check_verify_result_after_replace (string suffix, boost::function<path (string)>
 }
 
 
+static
+void
+add_font(shared_ptr<dcp::SubtitleAsset> asset)
+{
+	dcp::ArrayData fake_font(1024);
+	asset->add_font("font", fake_font);
+}
+
+
+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();
@@ -320,14 +369,13 @@ 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;
 	BOOST_REQUIRE (st == stages.end());
 
-	BOOST_CHECK_EQUAL (notes.size(), 0);
+	BOOST_CHECK_EQUAL (notes.size(), 0U);
 }
 
 
@@ -338,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()),
 		});
 }
 
@@ -368,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 'xLq7ot/GobgrqUYdlbR8FCD5APqs=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xgVKhC9IkWyzQbgzpFcJ1bpqbtwk=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xc1DRq6GaSzV2brF0YnSNed46nqk=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 }
+			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 },
 		});
 }
 
@@ -390,15 +454,24 @@ 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::FAILED_READ, string("Bad content kind '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())
+		});
 }
 
 
@@ -406,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());
 }
 
 
@@ -414,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());
 }
 
 
@@ -442,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" }
 		});
@@ -479,7 +553,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
 	/* There's no MISMATCHED_CPL_HASHES error here because it can't find the correct hash by ID (since the ID is wrong) */
 	check_verify_result_after_replace (
 			"invalid_xml_cpl_id", &cpl,
-			"<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
+			"<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab", "<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358a",
 			{ dcp::VerificationNote::Code::INVALID_XML }
 			);
 }
@@ -500,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 }
 		);
 }
@@ -510,7 +584,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
 {
 	check_verify_result_after_replace (
-		"invalix_xml_asset_map_id", &asset_map,
+		"invalid_xml_asset_map_id", &asset_map,
 		"<Id>urn:uuid:" + dcp_test1_asset_map_id.substr(0, 3),
 		"<Id>urn:uuid:x" + dcp_test1_asset_map_id.substr(1, 2),
 		{ dcp::VerificationNote::Code::INVALID_XML }
@@ -522,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";
@@ -566,29 +640,58 @@ 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 */
 BOOST_AUTO_TEST_CASE (verify_invalid_duration)
 {
 	auto dir = setup (8, "invalid_duration");
-	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") }
-		});
+
+	dcp::DCP dcp(dir);
+	dcp.read();
+	BOOST_REQUIRE(dcp.cpls().size() == 1);
+	auto cpl = dcp.cpls()[0];
+
+	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::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2")
+				).set_cpl_id(cpl->id())
+			);
+	}
+
+	check_verify_result({ dir }, {}, expected);
 }
 
 
@@ -598,7 +701,7 @@ dcp_from_frame (dcp::ArrayData const& frame, path dir)
 {
 	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	create_directories (dir);
-	auto writer = asset->start_write (dir / "pic.mxf", true);
+	auto writer = asset->start_write(dir / "pic.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
 	for (int i = 0; i < 24; ++i) {
 		writer->write (frame.data(), frame.size());
 	}
@@ -627,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);
 }
 
 
@@ -655,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);
 }
 
 
@@ -676,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()) }
+		);
 }
 
 
@@ -687,9 +829,38 @@ 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},
+		{},
+		{
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
+{
+	path const dir("build/test/verify_catch_missing_font_file_with_interop_ccap");
+	prepare_directory(dir);
+	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);
+	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 }});
+	check_verify_result (
+		{dir},
+		{},
+		{
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -702,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");
@@ -711,17 +882,70 @@ 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
-			}
+				).set_cpl_id(cpl->id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+				).set_cpl_id(cpl->id())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
+{
+	path const dir("build/test/verify_interop_subtitle_asset_with_no_subtitles");
+	prepare_directory(dir);
+	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);
+	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(
+				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())
+		});
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
+{
+	path const dir("build/test/verify_interop_subtitle_asset_with_single_space_subtitle");
+	prepare_directory(dir);
+	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);
+	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(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"}
+				).set_cpl_id(cpl->id())
 		});
+
 }
 
 
@@ -734,7 +958,20 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
-	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()),
+			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()),
+		});
 }
 
 
@@ -752,17 +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() },
+				).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()),
 		});
 }
 
@@ -778,11 +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(
+				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())
 		});
 }
 
@@ -799,8 +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(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"}
+				).set_cpl_id(cpl->id())
 		});
 }
 
@@ -817,9 +1086,18 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes
 
 	check_verify_result (
 		{ dir },
+		{},
 		{
+			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(
+				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())
 		});
 }
 
@@ -845,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())
 		});
 }
 
@@ -869,7 +1150,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 
 	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->add (reel);
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
 	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
@@ -877,25 +1158,40 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
-	dcp.write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp.set_annotation_text("hello");
+	dcp.write_xml ();
+}
+
+
+path
+find_prefix(path dir, string prefix)
+{
+	auto iter = std::find_if(directory_iterator(dir), directory_iterator(), [prefix](path const& p) {
+		return boost::starts_with(p.filename().string(), prefix);
+	});
+
+	BOOST_REQUIRE(iter != directory_iterator());
+	return iter->path();
 }
 
 
 path find_cpl (path dir)
 {
-	for (auto i: directory_iterator(dir)) {
-		if (boost::starts_with(i.path().filename().string(), "cpl_")) {
-			return i.path();
-		}
-	}
+	return find_prefix(dir, "cpl_");
+}
 
-	BOOST_REQUIRE (false);
-	return {};
+
+path
+find_pkl(path dir)
+{
+	return find_prefix(dir, "pkl_");
+}
+
+
+path
+find_asset_map(path dir)
+{
+	return find_prefix(dir, "ASSETMAP");
 }
 
 
@@ -911,7 +1207,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 	reel->add (black_picture_asset(dir));
 	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->add (reel);
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
 	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
@@ -921,12 +1217,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
-	dcp.write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp.set_annotation_text("hello");
+	dcp.write_xml();
+
+	HashCalculator calc(find_cpl(dir));
 
 	{
 		Editor e (find_cpl(dir));
@@ -935,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()), 54 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 55 },
-			{
+			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 "
@@ -948,9 +1247,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 				       "MainSoundSampleRate,MainPictureStoredArea,MainPictureActiveArea,MainSubtitleLanguageList?,"
 				       "ExtensionMetadataList?,)'"),
 				canonical(cpl->file().get()),
-				75
-			},
-			{ 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())
 		});
 }
 
@@ -965,19 +1265,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 	reel->add (black_picture_asset(dir));
 	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->add (reel);
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
 	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
 
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
-	dcp.write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp.set_annotation_text("hello");
+	dcp.write_xml();
 
 	{
 		Editor e (find_cpl(dir));
@@ -986,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") }}
 		);
 }
@@ -1005,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())
 		});
 }
 
@@ -1028,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())
 		});
 }
 
@@ -1057,7 +1368,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 	cpl->add (reel);
 	cpl->_additional_subtitle_languages.push_back("this-is-wrong");
 	cpl->_additional_subtitle_languages.push_back("andso-is-this");
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
 	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
@@ -1065,20 +1376,25 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 	cpl->_release_territory = "fred-jim";
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp->set_annotation_text("hello");
+	dcp->write_xml();
 
 	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()),
 		});
 }
 
@@ -1098,7 +1414,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	} else {
 		mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	}
-	auto picture_writer = mp->start_write (dcp_path / "video.mxf", false);
+	auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
 
 	auto image = black_image (dcp::Size(width, height));
 	auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
@@ -1112,10 +1428,10 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->set_annotation_text ("A Test DCP");
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
-	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
-	cpl->set_main_picture_active_area (dcp::Size(1998, 1080));
+	cpl->set_main_picture_stored_area(dcp::Size(width, height));
+	cpl->set_main_picture_active_area(dcp::Size(width, height));
 	cpl->set_version_number (1);
 
 	auto reel = make_shared<dcp::Reel>();
@@ -1131,14 +1447,10 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	cpl->add (reel);
 
 	d->add (cpl);
-	d->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	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;
 }
 
 
@@ -1235,10 +1547,10 @@ BOOST_AUTO_TEST_CASE (verify_picture_size)
 
 static
 void
-add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, string text = "Hello")
+add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, dcp::VAlign v_align = dcp::VAlign::CENTER, string text = "Hello")
 {
 	asset->add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			optional<string>(),
 			false,
 			false,
@@ -1251,14 +1563,16 @@ add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int en
 			0,
 			dcp::HAlign::CENTER,
 			v_position,
-			dcp::VAlign::CENTER,
+			v_align,
+			0,
 			dcp::Direction::LTR,
 			text,
 			dcp::Effect::NONE,
 			dcp::Colour(),
 			dcp::Time(),
 			dcp::Time(),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 		)
 	);
 }
@@ -1273,6 +1587,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 	for (int i = 0; i < 2048; ++i) {
 		add_test_subtitle (asset, i * 24, i * 24 + 20);
 	}
+	add_font(asset);
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 49148, 0);
@@ -1280,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("372207"),
+				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())
 		});
 }
 
@@ -1324,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("121695136"), 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())
 		});
 }
 
@@ -1349,7 +1682,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 
 	string const xml =
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
 		"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
 		"<ContentTitleText>Content</ContentTitleText>"
 		"<AnnotationText>Annotation</AnnotationText>"
@@ -1368,27 +1701,28 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 		"</SubtitleList>"
 		"</SubtitleReel>";
 
-	auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+	dcp::File xml_file(dir / "subs.xml", "w");
 	BOOST_REQUIRE (xml_file);
-	fwrite (xml.c_str(), xml.size(), 1, xml_file);
-	fclose (xml_file);
+	xml_file.write(xml.c_str(), xml.size(), 1);
+	xml_file.close();
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	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);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	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())
 		});
 }
 
@@ -1404,6 +1738,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 		subs->set_language (dcp::LanguageTag("de-DE"));
 		subs->add (simple_subtitle());
+		add_font(subs);
 		subs->write (path / "subs1.mxf");
 		auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_subs);
@@ -1413,24 +1748,27 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 		subs->set_language (dcp::LanguageTag("en-US"));
 		subs->add (simple_subtitle());
+		add_font(subs);
 		subs->write (path / "subs2.mxf");
 		auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_subs);
 	}
 
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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()),
 		});
 }
 
@@ -1446,6 +1784,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
 		ccaps->set_language (dcp::LanguageTag("de-DE"));
 		ccaps->add (simple_subtitle());
+		add_font(ccaps);
 		ccaps->write (path / "subs1.mxf");
 		auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_ccaps);
@@ -1455,23 +1794,24 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
 		ccaps->set_language (dcp::LanguageTag("en-US"));
 		ccaps->add (simple_subtitle());
+		add_font(ccaps);
 		ccaps->write (path / "subs2.mxf");
 		auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_ccaps);
 	}
 
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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())
 		});
 }
 
@@ -1484,7 +1824,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 
 	string const xml =
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
 		"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
 		"<ContentTitleText>Content</ContentTitleText>"
 		"<AnnotationText>Annotation</AnnotationText>"
@@ -1503,27 +1843,28 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 		"</SubtitleList>"
 		"</SubtitleReel>";
 
-	auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+	dcp::File xml_file(dir / "subs.xml", "w");
 	BOOST_REQUIRE (xml_file);
-	fwrite (xml.c_str(), xml.size(), 1, xml_file);
-	fclose (xml_file);
+	xml_file.write(xml.c_str(), xml.size(), 1);
+	xml_file.close();
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	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);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	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())
 		});
 }
 
@@ -1536,7 +1877,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 
 	string const xml =
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
 		"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
 		"<ContentTitleText>Content</ContentTitleText>"
 		"<AnnotationText>Annotation</AnnotationText>"
@@ -1556,27 +1897,28 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 		"</SubtitleList>"
 		"</SubtitleReel>";
 
-	auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+	dcp::File xml_file(dir / "subs.xml", "w");
 	BOOST_REQUIRE (xml_file);
-	fwrite (xml.c_str(), xml.size(), 1, xml_file);
-	fclose (xml_file);
+	xml_file.write(xml.c_str(), xml.size(), 1);
+	xml_file.close();
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	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);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	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())
 		});
 }
 
@@ -1584,31 +1926,38 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 class TestText
 {
 public:
-	TestText (int in_, int out_, float v_position_ = 0, string text_ = "Hello")
+	TestText (int in_, int out_, float v_position_ = 0, dcp::VAlign v_align_ = dcp::VAlign::CENTER, string text_ = "Hello")
 		: in(in_)
 		, out(out_)
 		, v_position(v_position_)
+		, v_align(v_align_)
 		, text(text_)
 	{}
 
 	int in;
 	int out;
 	float v_position;
+	dcp::VAlign v_align;
 	string text;
 };
 
 
 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>();
 	asset->set_start_time (dcp::Time());
 	for (auto i: subs) {
-		add_test_subtitle (asset, i.in, i.out, i.v_position, i.text);
+		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");
 
 	auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), asset->intrinsic_duration(), 0);
@@ -1616,27 +1965,76 @@ dcp_with_text (path dir, vector<TestText> subs)
 }
 
 
-BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
+template <class T>
+shared_ptr<dcp::CPL>
+dcp_with_text_from_file (path dir, boost::filesystem::path subs_xml)
 {
-	auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
-	/* Just too early */
-	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() }
-		});
-
-}
+	prepare_directory (dir);
+	auto asset = make_shared<dcp::SMPTESubtitleAsset>(subs_xml);
+	asset->set_start_time (dcp::Time());
+	asset->set_language (dcp::LanguageTag("de-DE"));
 
+	auto subs_mxf = dir / "subs.mxf";
+	asset->write (subs_mxf);
 
-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() }});
+	/* The call to write() puts the asset into the DCP correctly but it will have
+	 * XML re-written by our parser.  Overwrite the MXF using the given file's verbatim
+	 * contents.
+	 */
+	ASDCP::TimedText::MXFWriter writer;
+	ASDCP::WriterInfo writer_info;
+	writer_info.LabelSetType = ASDCP::LS_MXF_SMPTE;
+	unsigned int c;
+	Kumu::hex2bin (asset->id().c_str(), writer_info.AssetUUID, Kumu::UUID_Length, &c);
+	DCP_ASSERT (c == Kumu::UUID_Length);
+	ASDCP::TimedText::TimedTextDescriptor descriptor;
+	descriptor.ContainerDuration = asset->intrinsic_duration();
+	Kumu::hex2bin (asset->xml_id()->c_str(), descriptor.AssetID, ASDCP::UUIDlen, &c);
+	DCP_ASSERT (c == Kumu::UUID_Length);
+	ASDCP::Result_t r = writer.OpenWrite (subs_mxf.string().c_str(), writer_info, descriptor, 16384);
+	BOOST_REQUIRE (!ASDCP_FAILURE(r));
+	r = writer.WriteTimedTextResource (dcp::file_to_string(subs_xml));
+	BOOST_REQUIRE (!ASDCP_FAILURE(r));
+	writer.Finalize ();
+
+	auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), asset->intrinsic_duration(), 0);
+	return write_dcp_with_single_asset (dir, reel_asset);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
+{
+	auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
+	/* Just too early */
+	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
+	check_verify_result (
+		{ dir },
+		{},
+		{
+			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())
+		});
+
+}
+
+
+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(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
 }
 
 
@@ -1650,16 +2048,18 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	/* Just late enough */
 	add_test_subtitle (asset1, 4 * 24, 5 * 24);
 	asset1->set_language (dcp::LanguageTag("de-DE"));
+	add_font(asset1);
 	asset1->write (dir / "subs1.mxf");
 	auto reel_asset1 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset1, dcp::Fraction(24, 1), 5 * 24, 0);
 	auto reel1 = make_shared<dcp::Reel>();
 	reel1->add (reel_asset1);
-	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24, 0);
+	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24);
 	markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
 	reel1->add (markers1);
 
 	auto asset2 = make_shared<dcp::SMPTESubtitleAsset>();
 	asset2->set_start_time (dcp::Time());
+	add_font(asset2);
 	/* This would be too early on first reel but should be OK on the second */
 	add_test_subtitle (asset2, 3, 4 * 24);
 	asset2->set_language (dcp::LanguageTag("de-DE"));
@@ -1667,7 +2067,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	auto reel_asset2 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset2, dcp::Fraction(24, 1), 4 * 24, 0);
 	auto reel2 = make_shared<dcp::Reel>();
 	reel2->add (reel_asset2);
-	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24, 0);
+	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24);
 	markers2->set (dcp::Marker::LFOC, dcp::Time(4 * 24 - 1, 24, 24));
 	reel2->add (markers2);
 
@@ -1676,15 +2076,17 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	cpl->add (reel2);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
-
+	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())
+		});
 }
 
 
@@ -1699,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())
 		});
 }
 
@@ -1715,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())
+		});
 }
 
 
@@ -1725,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())
 		});
 }
 
@@ -1736,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())
+		});
 }
 
 
@@ -1747,6 +2175,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
 	asset->set_start_time (dcp::Time());
 	add_test_subtitle (asset, 0, 4 * 24);
+	add_font(asset);
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
 
@@ -1754,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())
 		});
 
 }
@@ -1770,16 +2208,21 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 200, 0.0, "We" },
-			{ 96, 200, 0.1, "have" },
-			{ 96, 200, 0.2, "four" },
-			{ 96, 200, 0.3, "lines" }
+			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 96, 200, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
 	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())
 		});
 }
 
@@ -1790,11 +2233,19 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 200, 0.0, "We" },
-			{ 96, 200, 0.1, "have" },
-			{ 96, 200, 0.2, "four" },
+			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+		});
+
+	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())
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1804,16 +2255,21 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "We" },
-			{ 96, 300, 0.1, "have" },
-			{ 150, 180, 0.2, "four" },
-			{ 150, 180, 0.3, "lines" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 150, 180, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
 	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())
 		});
 }
 
@@ -1824,12 +2280,20 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "We" },
-			{ 96, 300, 0.1, "have" },
-			{ 150, 180, 0.2, "four" },
-			{ 190, 250, 0.3, "lines" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
+		});
+
+	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())
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1839,13 +2303,18 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123" }
 		});
 	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())
 		});
 }
 
@@ -1856,13 +2325,18 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
 		});
 	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())
 		});
 }
 
@@ -1873,16 +2347,21 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
 		dir,
 		{
-			{ 96, 200, 0.0, "We" },
-			{ 96, 200, 0.1, "have" },
-			{ 96, 200, 0.2, "four" },
-			{ 96, 200, 0.3, "lines" }
+			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 96, 200, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
 	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())
 		});
 }
 
@@ -1893,11 +2372,19 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
 		dir,
 		{
-			{ 96, 200, 0.0, "We" },
-			{ 96, 200, 0.1, "have" },
-			{ 96, 200, 0.2, "four" },
+			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+		});
+
+	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())
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1907,16 +2394,21 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "We" },
-			{ 96, 300, 0.1, "have" },
-			{ 150, 180, 0.2, "four" },
-			{ 150, 180, 0.3, "lines" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 150, 180, 0.3, dcp::VAlign::CENTER, "lines" }
 		});
 	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())
 		});
 }
 
@@ -1927,12 +2419,40 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "We" },
-			{ 96, 300, 0.1, "have" },
-			{ 150, 180, 0.2, "four" },
-			{ 190, 250, 0.3, "lines" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+			{ 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+			{ 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+			{ 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
+		});
+
+	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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
+{
+	auto const dir = path ("build/test/verify_valid_closed_caption_line_length");
+	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+		dir,
+		{
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
+		});
+
+	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())
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1942,17 +2462,146 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
 		dir,
 		{
-			{ 96, 300, 0.0, "0123456789012345678901234567890123" }
+			{ 96, 300, 0.0, dcp::VAlign::CENTER, "0123456789012345678901234567890123" }
+		});
+	check_verify_result (
+		{dir},
+		{},
+		{
+			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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
+{
+	auto const dir = path ("build/test/verify_mismatched_closed_caption_valign1");
+	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+		dir,
+		{
+			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+			{ 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+			{ 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
+		});
+	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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
+{
+	auto const dir = path ("build/test/verify_mismatched_closed_caption_valign2");
+	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+		dir,
+		{
+			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+			{ 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+			{ 96, 300, 0.2, dcp::VAlign::CENTER, "not fine" },
 		});
 	check_verify_result (
 		{dir},
+		{},
+		{
+			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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
+{
+	auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering1");
+	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+		dir,
+		{
+			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+			{ 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+			{ 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
+		});
+
+	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::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
 		});
 }
 
 
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
+{
+	auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering2");
+	auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+		dir,
+		{
+			{ 96, 300, 0.2, dcp::VAlign::BOTTOM, "This" },
+			{ 96, 300, 0.1, dcp::VAlign::BOTTOM, "is" },
+			{ 96, 300, 0.0, dcp::VAlign::BOTTOM, "also fine" },
+		});
+
+	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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
+{
+	auto const dir = path ("build/test/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(
+				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())
+		});
+}
+
+
+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(
+		{dir},
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+				).set_cpl_id(cpl->id())
+		});
+}
+
+
+
 BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 {
 	path const dir("build/test/verify_invalid_sound_frame_rate");
@@ -1970,18 +2619,19 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 	cpl->add (reel);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"hello"
-		);
+	dcp->set_annotation_text("hello");
+	dcp->write_xml();
 
 	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())
 		});
 }
 
@@ -1990,17 +2640,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 {
 	path const dir("build/test/verify_missing_cpl_annotation_text");
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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());
@@ -2009,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())
 		});
 }
 
@@ -2020,16 +2672,13 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 {
 	path const dir("build/test/verify_mismatched_cpl_annotation_text");
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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());
@@ -2038,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())
 		});
 }
 
@@ -2064,18 +2718,19 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 	cpl->add (reel);
 
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->set_annotation_text("A Test DCP");
+	dcp->write_xml();
 
 	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())
 		});
 }
 
@@ -2095,46 +2750,43 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
+	add_font(subs);
 	subs->write (dir / "subs.mxf");
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 
 	auto reel1 = make_shared<dcp::Reel>(
-		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
-		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
+		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "1", dcp::MXFMetadata(), "en-US", reel_length), 0)
 		);
 
 	if (add_to_reel1) {
 		reel1->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
-	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
 	markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
 	reel1->add (markers1);
 
 	cpl->add (reel1);
 
 	auto reel2 = make_shared<dcp::Reel>(
-		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
-		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "2", reel_length), 0),
+		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "2", dcp::MXFMetadata(), "en-US", reel_length), 0)
 		);
 
 	if (add_to_reel2) {
 		reel2->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
-	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
 	markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 24, 24));
 	reel2->add (markers2);
 
 	cpl->add (reel2);
 
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->set_annotation_text("A Test DCP");
+	dcp->write_xml();
 
 	return cpl;
 }
@@ -2147,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())
 			});
 
 	}
@@ -2157,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())
+			});
 	}
 }
 
@@ -2182,45 +2853,42 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
+	add_font(subs);
 	subs->write (dir / "subs.mxf");
 
 	auto reel1 = make_shared<dcp::Reel>(
-		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
-		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
+		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "1", dcp::MXFMetadata(), "en-US", reel_length), 0)
 		);
 
 	for (int i = 0; i < caps_in_reel1; ++i) {
 		reel1->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
-	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
 	markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
 	reel1->add (markers1);
 
 	cpl->add (reel1);
 
 	auto reel2 = make_shared<dcp::Reel>(
-		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
-		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "2", reel_length), 0),
+		make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "2", dcp::MXFMetadata(), "en-US", reel_length), 0)
 		);
 
 	for (int i = 0; i < caps_in_reel2; ++i) {
 		reel2->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
-	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
 	markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 24, 24));
 	reel2->add (markers2);
 
 	cpl->add (reel2);
 
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->set_annotation_text("A Test DCP");
+	dcp->write_xml();
 
 	return cpl;
 }
@@ -2233,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())
+			});
 	}
 }
 
@@ -2267,6 +2954,7 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
+	add_font(subs);
 	subs->write (dir / "subs.mxf");
 	auto reel_text = make_shared<T>(subs, dcp::Fraction(24, 1), reel_length, 0);
 	adjust (reel_text);
@@ -2283,18 +2971,19 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 	cpl->add (reel);
 
 	dcp->add (cpl);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->set_annotation_text("A Test DCP");
+	dcp->write_xml();
 
 	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())
 		});
 }
 
@@ -2341,12 +3030,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 
 	path const dir("build/test/verify_missing_hash");
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
 	auto const cpl = dcp->cpls()[0];
@@ -2354,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());
@@ -2362,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())
 		});
 }
 
@@ -2378,20 +3069,20 @@ verify_markers_test (
 	)
 {
 	auto dcp = make_simple (dir);
-	dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
-	auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24, 0);
+	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);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	cpl->reels()[0]->add(markers_asset);
+	dcp->write_xml();
+
+	for (auto& note: test_notes) {
+		note.set_cpl_id(cpl->id());
+	}
 
-	check_verify_result ({dir}, test_notes);
+	check_verify_result({dir}, {}, test_notes);
 }
 
 
@@ -2485,14 +3176,16 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 	auto dcp = make_simple (dir);
 	auto cpl = dcp->cpls()[0];
 	cpl->unset_version_number();
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	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())
+		});
 }
 
 
@@ -2500,16 +3193,13 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 {
 	path dir = "build/test/verify_missing_extension_metadata1";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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>");
@@ -2517,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())
 		});
 }
 
@@ -2528,15 +3223,12 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 {
 	path dir = "build/test/verify_missing_extension_metadata2";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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>");
@@ -2544,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())
 		});
 }
 
@@ -2555,15 +3252,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 {
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata3";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Name>A", "<meta:NameX>A");
@@ -2572,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(), 75 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
-			{ 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()),
 		});
 }
 
@@ -2584,15 +3284,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 {
 	path dir = "build/test/verify_invalid_extension_metadata1";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("Application", "Fred");
@@ -2600,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())
 		});
 }
 
@@ -2611,15 +3313,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 {
 	path dir = "build/test/verify_invalid_extension_metadata2";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("DCP Constraints Profile", "Fred");
@@ -2627,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())
 		});
 }
 
@@ -2638,15 +3342,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 {
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata6";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Value>", "<meta:ValueX>");
@@ -2655,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(), 79 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 80 },
-			{ 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())
 		});
 }
 
@@ -2667,15 +3375,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 {
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata7";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	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");
@@ -2683,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())
 		});
 }
 
@@ -2694,15 +3404,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 {
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata8";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:Property>", "<meta:PropertyX>");
@@ -2711,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(), 77 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 81 },
-			{ 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()),
 		});
 }
 
@@ -2723,15 +3436,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 {
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata9";
 	auto dcp = make_simple (dir);
-	dcp->write_xml (
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::String::compose("libdcp %1", dcp::version),
-		dcp::LocalTime().as_string(),
-		"A Test DCP"
-		);
+	dcp->write_xml();
 
 	auto const cpl = dcp->cpls()[0];
 
+	HashCalculator calc(cpl->file().get());
+
 	{
 		Editor e (cpl->file().get());
 		e.replace ("<meta:PropertyList>", "<meta:PropertyListX>");
@@ -2740,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(), 76 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
-			{ 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()),
 		});
 }
 
@@ -2757,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())
 		});
 }
 
@@ -2788,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)
+				)
 		});
 }
 
@@ -2818,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}, {}, {});
 }
 
 
@@ -2846,7 +3601,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_key (key);
 
-	auto writer = mp->start_write (dir / "video.mxf", false);
+	auto writer = mp->start_write(dir / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data(), j2c.size());
@@ -2871,7 +3626,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 	cpl->set_issuer ("OpenDCP 0.0.25");
 	cpl->set_creator ("OpenDCP 0.0.25");
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
-	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,C,R,LFE,-,-"));
 	cpl->set_main_sound_sample_rate (48000);
 	cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
@@ -2879,12 +3634,19 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
 	d.add (cpl);
 
-	d.write_xml ("OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
+	d.set_issuer("OpenDCP 0.0.25");
+	d.set_creator("OpenDCP 0.0.25");
+	d.set_issue_date("2012-07-17T04:45:18+00:00");
+	d.set_annotation_text("A Test DCP");
+	d.write_xml(signer);
 
 	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())
 		});
 }
 
@@ -2895,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, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -2906,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, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -2921,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, notes);
+	verify_j2k(frame, 0, 0, 24, notes);
 	BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
@@ -2948,20 +3710,21 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 	auto xml_id = dcp::make_uuid ();
 	ASDCP::TimedText::MXFWriter writer;
 	auto subs_mxf = dir / "subs.mxf";
-	auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+	auto r = writer.OpenWrite(subs_mxf.string().c_str(), writer_info, descriptor, 4096);
 	BOOST_REQUIRE (ASDCP_SUCCESS(r));
 	writer.WriteTimedTextResource (dcp::String::compose(
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
 		"<Id>urn:uuid:%1</Id>"
 		"<ContentTitleText>Content</ContentTitleText>"
 		"<AnnotationText>Annotation</AnnotationText>"
-		"<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+		"<IssueDate>2018-10-02T12:25:14</IssueDate>"
 		"<ReelNumber>1</ReelNumber>"
 		"<Language>en-US</Language>"
 		"<EditRate>25 1</EditRate>"
 		"<TimeCodeRate>25</TimeCodeRate>"
 		"<StartTime>00:00:00:00</StartTime>"
+		"<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
 		"<SubtitleList>"
 		"<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
 		"<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
@@ -2981,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())
 		});
 }
 
@@ -3012,11 +3784,11 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 	auto xml_id = resource_id;
 	ASDCP::TimedText::MXFWriter writer;
 	auto subs_mxf = dir / "subs.mxf";
-	auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+	auto r = writer.OpenWrite(subs_mxf.string().c_str(), writer_info, descriptor, 4096);
 	BOOST_REQUIRE (ASDCP_SUCCESS(r));
 	writer.WriteTimedTextResource (dcp::String::compose(
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
 		"<Id>urn:uuid:%1</Id>"
 		"<ContentTitleText>Content</ContentTitleText>"
 		"<AnnotationText>Annotation</AnnotationText>"
@@ -3026,6 +3798,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 		"<EditRate>25 1</EditRate>"
 		"<TimeCodeRate>25</TimeCodeRate>"
 		"<StartTime>00:00:00:00</StartTime>"
+		"<LoadFont ID=\"font\">urn:uuid:0ce6e0ba-58b9-4344-8929-4d9c959c2d55</LoadFont>"
 		"<SubtitleList>"
 		"<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
 		"<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
@@ -3045,11 +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(
+				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())
 		});
 }
 
@@ -3057,18 +3842,655 @@ 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
-			},
+				)
+		});
+
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
+{
+	path dir = "build/test/verify_unexpected_things_in_main_markers";
+	prepare_directory (dir);
+	auto dcp = make_simple (dir, 1, 24);
+	dcp->write_xml();
+
+	HashCalculator calc(find_cpl(dir));
+
+	{
+		Editor e (find_cpl(dir));
+		e.insert(
+			"          <IntrinsicDuration>24</IntrinsicDuration>",
+			"<EntryPoint>0</EntryPoint><Duration>24</Duration>"
+			);
+	}
+
+	dcp::CPL cpl (find_cpl(dir));
+
+	check_verify_result (
+		{ 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::UNEXPECTED_ENTRY_POINT
+				).set_cpl_id(cpl.id()),
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION
+				).set_cpl_id(cpl.id())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
+{
+	path dir = "build/test/verify_invalid_content_kind";
+	prepare_directory (dir);
+	auto dcp = make_simple (dir, 1, 24);
+	dcp->write_xml();
+
+	HashCalculator calc(find_cpl(dir));
+
+	{
+		Editor e(find_cpl(dir));
+		e.replace("trailer", "trip");
+	}
+
+	dcp::CPL cpl (find_cpl(dir));
+
+	check_verify_result (
+		{ 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_CONTENT_KIND, string("trip")
+				).set_cpl_id(cpl.id()),
+		});
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
+{
+	path dir = "build/test/verify_valid_content_kind";
+	prepare_directory (dir);
+	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>");
+	}
+
+	dcp::CPL cpl (find_cpl(dir));
+
+	check_verify_result (
+		{ 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()),
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
+{
+	path dir = "build/test/verify_invalid_main_picture_active_area_1";
+	prepare_directory(dir);
+	auto dcp = make_simple(dir, 1, 24);
+	dcp->write_xml();
+
+	auto constexpr area = "<meta:MainPictureActiveArea>";
+
+	HashCalculator calc(find_cpl(dir));
+
+	{
+		Editor e(find_cpl(dir));
+		e.delete_lines_after(area, 2);
+		e.insert(area, "<meta:Height>4080</meta:Height>");
+		e.insert(area, "<meta:Width>1997</meta:Width>");
+	}
+
+	dcp::PKL pkl(find_pkl(dir));
+	dcp::CPL cpl(find_cpl(dir));
+
+	check_verify_result(
+		{ 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()),
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
+{
+	path dir = "build/test/verify_invalid_main_picture_active_area_2";
+	prepare_directory(dir);
+	auto dcp = make_simple(dir, 1, 24);
+	dcp->write_xml();
+
+	auto constexpr area = "<meta:MainPictureActiveArea>";
+
+	HashCalculator calc(find_cpl(dir));
+
+	{
+		Editor e(find_cpl(dir));
+		e.delete_lines_after(area, 2);
+		e.insert(area, "<meta:Height>5125</meta:Height>");
+		e.insert(area, "<meta:Width>9900</meta:Width>");
+	}
+
+	dcp::PKL pkl(find_pkl(dir));
+	dcp::CPL cpl(find_cpl(dir));
+
+	check_verify_result(
+		{ 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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_duplicate_pkl_asset_ids)
+{
+	RNGFixer rg;
+
+	path dir = "build/test/verify_duplicate_pkl_asset_ids";
+	prepare_directory(dir);
+	auto dcp = make_simple(dir, 1, 24);
+	dcp->write_xml();
+
+	{
+		Editor e(find_pkl(dir));
+		e.replace("urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54", "urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab");
+	}
+
+	dcp::PKL pkl(find_pkl(dir));
+
+	check_verify_result(
+		{ dir },
+		{},
+		{
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl.id(), canonical(find_pkl(dir)) },
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids)
+{
+	RNGFixer rg;
+
+	path dir = "build/test/verify_duplicate_assetmap_asset_ids";
+	prepare_directory(dir);
+	auto dcp = make_simple(dir, 1, 24);
+	dcp->write_xml();
+
+	{
+		Editor e(find_asset_map(dir));
+		e.replace("urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54", "urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa");
+	}
+
+	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(
+				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")
+				)
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
+{
+	boost::filesystem::path const path = "build/test/verify_mismatched_sound_channel_counts";
+
+	dcp::MXFMetadata mxf_meta;
+	mxf_meta.company_name = "OpenDCP";
+	mxf_meta.product_name = "OpenDCP";
+	mxf_meta.product_version = "0.0.25";
+
+	auto constexpr sample_rate = 48000;
+	auto constexpr frames = 240;
+
+	boost::filesystem::remove_all(path);
+	boost::filesystem::create_directories(path);
+	auto dcp = make_shared<dcp::DCP>(path);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+	cpl->set_annotation_text("hello");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R"));
+	cpl->set_main_sound_sample_rate(sample_rate);
+	cpl->set_main_picture_stored_area(dcp::Size(1998, 1080));
+	cpl->set_main_picture_active_area(dcp::Size(1998, 1080));
+	cpl->set_version_number(1);
+
+	{
+
+		/* Reel with 2 channels of audio */
+
+		auto mp = simple_picture(path, "1", frames, {});
+		auto ms = simple_sound(path, "1", mxf_meta, "en-US", frames, sample_rate, {}, 2);
+
+		auto reel = make_shared<dcp::Reel>(
+			std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+			std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+			);
+
+		auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+		markers->set(dcp::Marker::FFOC, dcp::Time(0, 0, 0, 1, 24));
+		reel->add(markers);
+
+		cpl->add(reel);
+	}
+
+	{
+		/* Reel with 6 channels of audio */
+
+		auto mp = simple_picture(path, "2", frames, {});
+		auto ms = simple_sound(path, "2", mxf_meta, "en-US", frames, sample_rate, {}, 6);
+
+		auto reel = make_shared<dcp::Reel>(
+			std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+			std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+			);
+
+		auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+		markers->set(dcp::Marker::LFOC, dcp::Time(0, 0, 0, frames - 1, 24));
+		reel->add(markers);
+
+		cpl->add(reel);
+	}
+
+	dcp->add(cpl);
+	dcp->set_annotation_text("hello");
+	dcp->write_xml();
+
+	check_verify_result(
+		{ path },
+		{},
+		{
+			dcp::VerificationNote(
+				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2"))
+				).set_cpl_id(cpl->id())
 		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
+{
+	boost::filesystem::path const path = "build/test/verify_invalid_main_sound_configuration";
 
+	dcp::MXFMetadata mxf_meta;
+	mxf_meta.company_name = "OpenDCP";
+	mxf_meta.product_name = "OpenDCP";
+	mxf_meta.product_version = "0.0.25";
+
+	auto constexpr sample_rate = 48000;
+	auto constexpr frames = 240;
+
+	boost::filesystem::remove_all(path);
+	boost::filesystem::create_directories(path);
+	auto dcp = make_shared<dcp::DCP>(path);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+	cpl->set_annotation_text("hello");
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R,C,LFE,Ls,Rs"));
+	cpl->set_main_sound_sample_rate(sample_rate);
+	cpl->set_main_picture_stored_area(dcp::Size(1998, 1080));
+	cpl->set_main_picture_active_area(dcp::Size(1998, 1080));
+	cpl->set_version_number(1);
+
+	auto mp = simple_picture(path, "1", frames, {});
+	auto ms = simple_sound(path, "1", mxf_meta, "en-US", frames, sample_rate, {}, 2);
+
+	auto reel = make_shared<dcp::Reel>(
+		std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+		std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+		);
+
+	auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+	markers->set(dcp::Marker::FFOC, dcp::Time(0, 0, 0, 1, 24));
+	markers->set(dcp::Marker::LFOC, dcp::Time(0, 0, 9, 23, 24));
+	reel->add(markers);
+
+	cpl->add(reel);
+
+	dcp->add(cpl);
+	dcp->set_annotation_text("hello");
+	dcp->write_xml();
+
+	check_verify_result(
+		{ 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())
+		});
 }
 
+
+BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
+{
+	boost::filesystem::path const path = "build/test/verify_invalid_tile_part_size";
+	auto constexpr video_frames = 24;
+	auto constexpr sample_rate = 48000;
+
+	boost::filesystem::remove_all(path);
+	boost::filesystem::create_directories(path);
+
+	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto picture_writer = mp->start_write(path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+
+	dcp::Size const size(1998, 1080);
+	auto image = make_shared<dcp::OpenJPEGImage>(size);
+	boost::random::mt19937 rng(1);
+	boost::random::uniform_int_distribution<> dist(0, 4095);
+	for (int c = 0; c < 3; ++c) {
+		for (int p = 0; p < (1998 * 1080); ++p) {
+			image->data(c)[p] = dist(rng);
+		}
+	}
+	auto j2c = dcp::compress_j2k(image, 750000000, video_frames, false, false);
+	for (int i = 0; i < 24; ++i) {
+		picture_writer->write(j2c.data(), j2c.size());
+	}
+	picture_writer->finalize();
+
+	auto dcp = make_shared<dcp::DCP>(path);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+	cpl->set_content_version(
+		dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11", "content-version-label-text")
+		);
+	cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R,C,LFE,Ls,Rs"));
+	cpl->set_main_sound_sample_rate(sample_rate);
+	cpl->set_main_picture_stored_area(dcp::Size(1998, 1080));
+	cpl->set_main_picture_active_area(dcp::Size(1998, 1080));
+	cpl->set_version_number(1);
+
+	auto ms = simple_sound(path, "", dcp::MXFMetadata(), "en-US", video_frames, sample_rate, {});
+
+	auto reel = make_shared<dcp::Reel>(
+		make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+		make_shared<dcp::ReelSoundAsset>(ms, 0)
+		);
+
+	cpl->add(reel);
+	dcp->add(cpl);
+	dcp->set_annotation_text("A Test DCP");
+	dcp->write_xml();
+
+	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(
+				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())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
+{
+	path const dir("build/test/verify_missing_load_font");
+	prepare_directory (dir);
+	copy_file ("test/data/subs1.xml", dir / "subs.xml");
+	{
+		Editor editor(dir / "subs.xml");
+		editor.delete_first_line_containing("LoadFont");
+	}
+	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	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(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId").set_cpl_id(cpl->id())
+		});
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_missing_load_font)
+{
+	boost::filesystem::path const dir = "build/test/verify_missing_load_font";
+	prepare_directory(dir);
+	auto dcp = make_simple (dir, 1, 202);
+
+	string const xml =
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
+		"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+		"<ContentTitleText>Content</ContentTitleText>"
+		"<AnnotationText>Annotation</AnnotationText>"
+		"<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+		"<ReelNumber>1</ReelNumber>"
+		"<EditRate>24 1</EditRate>"
+		"<TimeCodeRate>24</TimeCodeRate>"
+		"<StartTime>00:00:00:00</StartTime>"
+		"<Language>de-DE</Language>"
+		"<SubtitleList>"
+		"<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+		"<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:06:00\" TimeOut=\"00:00:08:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+		"<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+		"</Subtitle>"
+		"</Font>"
+		"</SubtitleList>"
+		"</SubtitleReel>";
+
+	dcp::File xml_file(dir / "subs.xml", "w");
+	BOOST_REQUIRE(xml_file);
+	xml_file.write(xml.c_str(), xml.size(), 1);
+	xml_file.close();
+	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+	subs->write(dir / "subs.mxf");
+
+	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);
+	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()).set_cpl_id(cpl->id())
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_spots_wrong_asset)
+{
+	boost::filesystem::path const dir = "build/test/verify_spots_wrong_asset";
+	boost::filesystem::remove_all(dir);
+
+	auto dcp1 = make_simple(dir / "1");
+	dcp1->write_xml();
+
+	auto const asset_1 = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id();
+
+	auto dcp2 = make_simple(dir / "2");
+	dcp2->write_xml();
+	auto const asset_2 = dcp::MonoPictureAsset(dir / "2" / "video.mxf").id();
+
+	boost::filesystem::remove(dir / "1" / "video.mxf");
+	boost::filesystem::copy_file(dir / "2" / "video.mxf", dir / "1" / "video.mxf");
+
+	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)
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
+{
+	boost::filesystem::path const dir = "build/test/verify_cpl_content_version_label_text_empty";
+	boost::filesystem::remove_all(dir);
+
+	auto dcp = make_simple(dir);
+	BOOST_REQUIRE(dcp->cpls().size() == 1);
+	auto cpl = dcp->cpls()[0];
+	cpl->set_content_version(dcp::ContentVersion(""));
+	dcp->write_xml();
+
+	check_verify_result(
+		{dir},
+		{},
+		{
+			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)
+				)
+		});
+}
+
+