X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fverify.cc;h=42ee192119b85280ada83512167a01aaa2a4805d;hb=4dca630057509164494b65c2deeb748a51928c73;hp=2f8f0a535b3eb1d895d9add26d5134689aa8d649;hpb=c88d7a66e3751cac223704c68aa4278a9c0de638;p=libdcp.git

diff --git a/src/verify.cc b/src/verify.cc
index 2f8f0a53..42ee1921 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -58,6 +58,7 @@
 #include "stereo_picture_frame.h"
 #include "verify.h"
 #include "verify_j2k.h"
+#include <libxml/parserInternals.h>
 #include <xercesc/dom/DOMAttr.hpp>
 #include <xercesc/dom/DOMDocument.hpp>
 #include <xercesc/dom/DOMError.hpp>
@@ -242,7 +243,8 @@ public:
 		add("http://www.digicine.com/PROTO-ASDCP-AM-20040311.xsd", "PROTO-ASDCP-AM-20040311.xsd");
 		add("http://www.digicine.com/PROTO-ASDCP-CC-CPL-20070926#", "PROTO-ASDCP-CC-CPL-20070926.xsd");
 		add("interop-subs", "DCSubtitle.v1.mattsson.xsd");
-		add("http://www.smpte-ra.org/schemas/428-7/2010/DCST.xsd", "SMPTE-428-7-2010-DCST.xsd");
+		add("http://www.smpte-ra.org/schemas/428-7/2010/DCST.xsd", "DCDMSubtitle-2010.xsd");
+		add("http://www.smpte-ra.org/schemas/428-7/2014/DCST.xsd", "DCDMSubtitle-2014.xsd");
 		add("http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata", "SMPTE-429-16.xsd");
 		add("http://www.dolby.com/schemas/2012/AD", "Dolby-2012-AD.xsd");
 		add("http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL", "SMPTE-429-10-2008.xsd");
@@ -278,7 +280,7 @@ private:
 static void
 parse (XercesDOMParser& parser, boost::filesystem::path xml)
 {
-	parser.parse(xml.string().c_str());
+	parser.parse(xml.c_str());
 }
 
 
@@ -321,6 +323,7 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<Verificat
 		schema.push_back("PROTO-ASDCP-AM-20040311.xsd");
 		schema.push_back("DCSubtitle.v1.mattsson.xsd");
 		schema.push_back("DCDMSubtitle-2010.xsd");
+		schema.push_back("DCDMSubtitle-2014.xsd");
 		schema.push_back("PROTO-ASDCP-CC-CPL-20070926.xsd");
 		schema.push_back("SMPTE-429-16.xsd");
 		schema.push_back("Dolby-2012-AD.xsd");
@@ -383,6 +386,12 @@ enum class VerifyAssetResult {
 static VerifyAssetResult
 verify_asset (shared_ptr<const DCP> dcp, shared_ptr<const ReelFileAsset> reel_file_asset, function<void (float)> progress)
 {
+	/* When reading the DCP the hash will have been set to the one from the PKL/CPL.
+	 * We want to calculate the hash of the actual file contents here, so that we
+	 * can check it.  unset_hash() means that this calculation will happen on the
+	 * call to hash().
+	 */
+	reel_file_asset->asset_ref()->unset_hash();
 	auto const actual_hash = reel_file_asset->asset_ref()->hash(progress);
 
 	auto pkls = dcp->pkls();
@@ -447,7 +456,7 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
 			biggest_frame = max(biggest_frame, frame->size());
 			if (!mono_asset->encrypted() || mono_asset->key()) {
 				vector<VerificationNote> j2k_notes;
-				verify_j2k (frame, j2k_notes);
+				verify_j2k(frame, i, mono_asset->frame_rate().numerator, j2k_notes);
 				check_and_add (j2k_notes);
 			}
 			progress (float(i) / duration);
@@ -459,8 +468,8 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
 			biggest_frame = max(biggest_frame, max(frame->left()->size(), frame->right()->size()));
 			if (!stereo_asset->encrypted() || stereo_asset->key()) {
 				vector<VerificationNote> j2k_notes;
-				verify_j2k (frame->left(), j2k_notes);
-				verify_j2k (frame->right(), j2k_notes);
+				verify_j2k(frame->left(), i, stereo_asset->frame_rate().numerator, j2k_notes);
+				verify_j2k(frame->right(), i, stereo_asset->frame_rate().numerator, j2k_notes);
 				check_and_add (j2k_notes);
 			}
 			progress (float(i) / duration);
@@ -488,27 +497,32 @@ verify_main_picture_asset (
 	shared_ptr<const ReelPictureAsset> reel_asset,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	function<void (float)> progress,
+	VerificationOptions options,
 	vector<VerificationNote>& notes
 	)
 {
 	auto asset = reel_asset->asset();
 	auto const file = *asset->file();
-	stage ("Checking picture asset hash", file);
-	auto const r = verify_asset (dcp, reel_asset, progress);
-	switch (r) {
-		case VerifyAssetResult::BAD:
-			notes.push_back ({
-				VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
-			});
-			break;
-		case VerifyAssetResult::CPL_PKL_DIFFER:
-			notes.push_back ({
-				VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file
-			});
-			break;
-		default:
-			break;
+
+	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+		stage ("Checking picture asset hash", file);
+		auto const r = verify_asset (dcp, reel_asset, progress);
+		switch (r) {
+			case VerifyAssetResult::BAD:
+				notes.push_back ({
+					VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
+				});
+				break;
+			case VerifyAssetResult::CPL_PKL_DIFFER:
+				notes.push_back ({
+					VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file
+				});
+				break;
+			default:
+				break;
+		}
 	}
+
 	stage ("Checking picture frame sizes", asset->file());
 	verify_picture_asset (reel_asset, file, notes, progress);
 
@@ -565,29 +579,46 @@ verify_main_picture_asset (
 }
 
 
+struct State
+{
+	boost::optional<string> subtitle_language;
+	boost::optional<int> audio_channels;
+};
+
+
 static void
 verify_main_sound_asset (
 	shared_ptr<const DCP> dcp,
 	shared_ptr<const ReelSoundAsset> reel_asset,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	function<void (float)> progress,
-	vector<VerificationNote>& notes
+	VerificationOptions options,
+	vector<VerificationNote>& notes,
+	State& state
 	)
 {
 	auto asset = reel_asset->asset();
 	auto const file = *asset->file();
 
-	stage("Checking sound asset hash", file);
-	auto const r = verify_asset (dcp, reel_asset, progress);
-	switch (r) {
-		case VerifyAssetResult::BAD:
-			notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, file});
-			break;
-		case VerifyAssetResult::CPL_PKL_DIFFER:
-			notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, file});
-			break;
-		default:
-			break;
+	if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+		stage("Checking sound asset hash", file);
+		auto const r = verify_asset (dcp, reel_asset, progress);
+		switch (r) {
+			case VerifyAssetResult::BAD:
+				notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, file});
+				break;
+			case VerifyAssetResult::CPL_PKL_DIFFER:
+				notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, file});
+				break;
+			default:
+				break;
+		}
+	}
+
+	if (!state.audio_channels) {
+		state.audio_channels = asset->channels();
+	} else if (*state.audio_channels != asset->channels()) {
+		notes.push_back({ VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, file });
 	}
 
 	stage ("Checking sound asset metadata", file);
@@ -633,12 +664,6 @@ verify_closed_caption_reel (shared_ptr<const ReelClosedCaptionAsset> reel_asset,
 }
 
 
-struct State
-{
-	boost::optional<string> subtitle_language;
-};
-
-
 /** Verify stuff that is common to both subtitles and closed captions */
 void
 verify_smpte_timed_text_asset (
@@ -697,6 +722,10 @@ verify_interop_subtitle_asset(shared_ptr<const InteropSubtitleAsset> asset, vect
 	if (asset->subtitles().empty()) {
 		notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_SUBTITLE, asset->id(), asset->file().get() });
 	}
+	auto const unresolved = asset->unresolved_fonts();
+	if (!unresolved.empty()) {
+		notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_FONT, unresolved.front() });
+	}
 }
 
 
@@ -764,15 +793,33 @@ verify_subtitle_asset (
 		notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED});
 	}
 
+	auto namespace_count = [](shared_ptr<const SubtitleAsset> asset, string root_node) {
+		cxml::Document doc(root_node);
+		doc.read_string(asset->raw_xml().get());
+		auto root = dynamic_cast<xmlpp::Element*>(doc.node())->cobj();
+		int count = 0;
+		for (auto ns = root->nsDef; ns != nullptr; ns = ns->next) {
+			++count;
+		}
+		return count;
+	};
+
 	auto interop = dynamic_pointer_cast<const InteropSubtitleAsset>(asset);
 	if (interop) {
 		verify_interop_subtitle_asset(interop, notes);
+		if (namespace_count(asset, "DCSubtitle") > 1) {
+			notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() });
+		}
 	}
 
 	auto smpte = dynamic_pointer_cast<const SMPTESubtitleAsset>(asset);
 	if (smpte) {
 		verify_smpte_timed_text_asset (smpte, reel_asset_duration, notes);
 		verify_smpte_subtitle_asset (smpte, notes, state);
+		/* This asset may be encrypted and in that case we'll have no raw_xml() */
+		if (asset->raw_xml() && namespace_count(asset, "SubtitleReel") > 1) {
+			notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()});
+		}
 	}
 }
 
@@ -808,16 +855,18 @@ verify_closed_caption_asset (
 }
 
 
-/** Check the timing of the individual subtitles and make sure there are no empty <Text> nodes */
+/** Check the timing of the individual subtitles and make sure there are no empty <Text> nodes etc. */
 static
 void
 verify_text_details (
+	dcp::Standard standard,
 	vector<shared_ptr<Reel>> reels,
 	int edit_rate,
 	vector<VerificationNote>& notes,
 	std::function<bool (shared_ptr<Reel>)> check,
 	std::function<optional<string> (shared_ptr<Reel>)> xml,
-	std::function<int64_t (shared_ptr<Reel>)> duration
+	std::function<int64_t (shared_ptr<Reel>)> duration,
+	std::function<std::string (shared_ptr<Reel>)> id
 	)
 {
 	/* end of last subtitle (in editable units) */
@@ -829,9 +878,19 @@ verify_text_details (
 	auto empty_text = false;
 	/* current reel start time (in editable units) */
 	int64_t reel_offset = 0;
-
-	std::function<void (cxml::ConstNodePtr, optional<int>, optional<Time>, int, bool)> parse;
-	parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset](cxml::ConstNodePtr node, optional<int> tcr, optional<Time> start_time, int er, bool first_reel) {
+	optional<string> missing_load_font_id;
+
+	std::function<void (cxml::ConstNodePtr, optional<int>, optional<Time>, int, bool, bool&, vector<string>&)> parse;
+
+	parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset, &missing_load_font_id](
+		cxml::ConstNodePtr node,
+		optional<int> tcr,
+		optional<Time> start_time,
+		int er,
+		bool first_reel,
+		bool& has_text,
+		vector<string>& font_ids
+		) {
 		if (node->name() == "Subtitle") {
 			Time in (node->string_attribute("TimeIn"), tcr);
 			if (start_time) {
@@ -871,10 +930,22 @@ verify_text_details (
 			if (!node_has_content(node)) {
 				empty_text = true;
 			}
+			has_text = true;
+		} else if (node->name() == "LoadFont") {
+			if (auto const id = node->optional_string_attribute("Id")) {
+				font_ids.push_back(*id);
+			} else if (auto const id = node->optional_string_attribute("ID")) {
+				font_ids.push_back(*id);
+			}
+		} else if (node->name() == "Font") {
+			if (auto const font_id = node->optional_string_attribute("Id")) {
+				if (std::find_if(font_ids.begin(), font_ids.end(), [font_id](string const& id) { return id == font_id; }) == font_ids.end()) {
+					missing_load_font_id = font_id;
+				}
+			}
 		}
-
 		for (auto i: node->node_children()) {
-			parse(i, tcr, start_time, er, first_reel);
+			parse(i, tcr, start_time, er, first_reel, has_text, font_ids);
 		}
 	};
 
@@ -896,24 +967,32 @@ verify_text_details (
 		shared_ptr<cxml::Document> doc;
 		optional<int> tcr;
 		optional<Time> start_time;
-		try {
+		switch (standard) {
+		case dcp::Standard::INTEROP:
+			doc = make_shared<cxml::Document>("DCSubtitle");
+			doc->read_string (*reel_xml);
+			break;
+		case dcp::Standard::SMPTE:
 			doc = make_shared<cxml::Document>("SubtitleReel");
 			doc->read_string (*reel_xml);
 			tcr = doc->number_child<int>("TimeCodeRate");
-			auto start_time_string = doc->optional_string_child("StartTime");
-			if (start_time_string) {
+			if (auto start_time_string = doc->optional_string_child("StartTime")) {
 				start_time = Time(*start_time_string, tcr);
 			}
-		} catch (...) {
-			doc = make_shared<cxml::Document>("DCSubtitle");
-			doc->read_string (*reel_xml);
+			break;
 		}
-		parse (doc, tcr, start_time, edit_rate, i == 0);
+		bool has_text = false;
+		vector<string> font_ids;
+		parse(doc, tcr, start_time, edit_rate, i == 0, has_text, font_ids);
 		auto end = reel_offset + duration(reels[i]);
 		if (last_out && *last_out > end) {
 			reel_overlap = true;
 		}
 		reel_offset = end;
+
+		if (standard == dcp::Standard::SMPTE && has_text && font_ids.empty()) {
+			notes.push_back(dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_LOAD_FONT).set_id(id(reels[i])));
+		}
 	}
 
 	if (last_out && *last_out > reel_offset) {
@@ -949,6 +1028,10 @@ verify_text_details (
 			VerificationNote::Type::WARNING, VerificationNote::Code::EMPTY_TEXT
 		});
 	}
+
+	if (missing_load_font_id) {
+		notes.push_back(dcp::VerificationNote(VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id(*missing_load_font_id));
+	}
 }
 
 
@@ -1160,34 +1243,31 @@ verify_text_lines_and_characters (
 
 static
 void
-verify_text_details (vector<shared_ptr<Reel>> reels, vector<VerificationNote>& notes)
+verify_text_details(dcp::Standard standard, vector<shared_ptr<Reel>> reels, vector<VerificationNote>& notes)
 {
 	if (reels.empty()) {
 		return;
 	}
 
 	if (reels[0]->main_subtitle()) {
-		verify_text_details (reels, reels[0]->main_subtitle()->edit_rate().numerator, notes,
+		verify_text_details(standard, reels, reels[0]->main_subtitle()->edit_rate().numerator, notes,
 			[](shared_ptr<Reel> reel) {
 				return static_cast<bool>(reel->main_subtitle());
 			},
 			[](shared_ptr<Reel> reel) {
-				auto interop = dynamic_pointer_cast<ReelInteropSubtitleAsset>(reel->main_subtitle());
-				if (interop) {
-					return interop->asset()->raw_xml();
-				}
-				auto smpte = dynamic_pointer_cast<ReelSMPTESubtitleAsset>(reel->main_subtitle());
-				DCP_ASSERT (smpte);
-				return smpte->asset()->raw_xml();
+				return reel->main_subtitle()->asset()->raw_xml();
 			},
 			[](shared_ptr<Reel> reel) {
 				return reel->main_subtitle()->actual_duration();
+			},
+			[](shared_ptr<Reel> reel) {
+				return reel->main_subtitle()->id();
 			}
 		);
 	}
 
 	for (auto i = 0U; i < reels[0]->closed_captions().size(); ++i) {
-		verify_text_details (reels, reels[0]->closed_captions()[i]->edit_rate().numerator, notes,
+		verify_text_details(standard, reels, reels[0]->closed_captions()[i]->edit_rate().numerator, notes,
 			[i](shared_ptr<Reel> reel) {
 				return i < reel->closed_captions().size();
 			},
@@ -1196,6 +1276,9 @@ verify_text_details (vector<shared_ptr<Reel>> reels, vector<VerificationNote>& n
 			},
 			[i](shared_ptr<Reel> reel) {
 				return reel->closed_captions()[i]->actual_duration();
+			},
+			[i](shared_ptr<Reel> reel) {
+				return reel->closed_captions()[i]->id();
 			}
 		);
 	}
@@ -1297,6 +1380,7 @@ verify_reel(
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	boost::filesystem::path xsd_dtd_directory,
 	function<void (float)> progress,
+	VerificationOptions options,
 	vector<VerificationNote>& notes,
 	State& state,
 	bool* have_main_subtitle,
@@ -1350,7 +1434,7 @@ verify_reel(
 		}
 		/* Check asset */
 		if (reel->main_picture()->asset_ref().resolved()) {
-			verify_main_picture_asset(dcp, reel->main_picture(), stage, progress, notes);
+			verify_main_picture_asset(dcp, reel->main_picture(), stage, progress, options, notes);
 			auto const asset_size = reel->main_picture()->asset()->size();
 			if (main_picture_active_area) {
 				if (main_picture_active_area->width > asset_size.width) {
@@ -1371,10 +1455,11 @@ verify_reel(
 				}
 			}
 		}
+
 	}
 
 	if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
-		verify_main_sound_asset(dcp, reel->main_sound(), stage, progress, notes);
+		verify_main_sound_asset(dcp, reel->main_sound(), stage, progress, options, notes, state);
 	}
 
 	if (reel->main_subtitle()) {
@@ -1420,6 +1505,7 @@ verify_cpl(
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	boost::filesystem::path xsd_dtd_directory,
 	function<void (float)> progress,
+	VerificationOptions options,
 	vector<VerificationNote>& notes,
 	State& state
 	)
@@ -1462,6 +1548,15 @@ verify_cpl(
 		}
 	}
 
+	for (auto version: cpl->content_versions()) {
+		if (version.label_text.empty()) {
+			notes.push_back(
+				dcp::VerificationNote(VerificationNote::Type::WARNING, VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_id(cpl->id())
+				);
+			break;
+		}
+	}
+
 	if (dcp->standard() == Standard::SMPTE) {
 		if (!cpl->annotation_text()) {
 			notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
@@ -1537,6 +1632,7 @@ verify_cpl(
 			stage,
 			xsd_dtd_directory,
 			progress,
+			options,
 			notes,
 			state,
 			&have_main_subtitle,
@@ -1547,9 +1643,19 @@ verify_cpl(
 			);
 	}
 
-	verify_text_details(cpl->reels(), notes);
+	verify_text_details(dcp->standard().get_value_or(dcp::Standard::SMPTE), cpl->reels(), notes);
 
 	if (dcp->standard() == Standard::SMPTE) {
+		if (auto msc = cpl->main_sound_configuration()) {
+			if (state.audio_channels && msc->channels() != *state.audio_channels) {
+				notes.push_back({
+						VerificationNote::Type::ERROR,
+						VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
+						String::compose("MainSoundConfiguration has %1 channels but sound assets have %2", msc->channels(), *state.audio_channels),
+						cpl->file().get()
+					});
+			}
+		}
 
 		if (have_main_subtitle && have_no_main_subtitle) {
 			notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS});
@@ -1695,6 +1801,7 @@ dcp::verify (
 	vector<boost::filesystem::path> directories,
 	function<void (string, optional<boost::filesystem::path>)> stage,
 	function<void (float)> progress,
+	VerificationOptions options,
 	optional<boost::filesystem::path> xsd_dtd_directory
 	)
 {
@@ -1725,6 +1832,8 @@ dcp::verify (
 			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		} catch (MXFFileError& e) {
 			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+		} catch (BadURNUUIDError& e) {
+			notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		} catch (cxml::Error& e) {
 			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		}
@@ -1744,6 +1853,7 @@ dcp::verify (
 				stage,
 				*xsd_dtd_directory,
 				progress,
+				options,
 				notes,
 				state
 				);
@@ -1803,7 +1913,7 @@ dcp::note_to_string (VerificationNote note)
 	case VerificationNote::Code::INVALID_XML:
 		return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
 	case VerificationNote::Code::MISSING_ASSETMAP:
-		return "No ASSETMAP or ASSETMAP.xml was found.";
+		return "No valid ASSETMAP or ASSETMAP.xml was found.";
 	case VerificationNote::Code::INVALID_INTRINSIC_DURATION:
 		return String::compose("The intrinsic duration of the asset %1 is less than 1 second.", note.note().get());
 	case VerificationNote::Code::INVALID_DURATION:
@@ -1964,13 +2074,34 @@ dcp::note_to_string (VerificationNote note)
 	case VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA:
 		return String::compose("<MainPictureActiveaArea> has an invalid value: %1", note.note().get());
 	case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL:
-		return String::compose("The PKL %1 has more than one asset with the same ID", note.note().get());
+		return String::compose("The PKL %1 has more than one asset with the same ID.", note.note().get());
 	case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP:
-		return String::compose("The ASSETMAP %1 has more than one asset with the same ID", note.note().get());
+		return String::compose("The ASSETMAP %1 has more than one asset with the same ID.", note.note().get());
 	case VerificationNote::Code::MISSING_SUBTITLE:
-		return String::compose("The subtitle asset %1 has no subtitles", note.note().get());
+		return String::compose("The subtitle asset %1 has no subtitles.", note.note().get());
 	case VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE:
 		return String::compose("<IssueDate> has an invalid value: %1", note.note().get());
+	case VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS:
+		return String::compose("The sound assets do not all have the same channel count; the first to differ is %1", note.file()->filename());
+	case VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION:
+		return String::compose("<MainSoundConfiguration> has an invalid value: %1", note.note().get());
+	case VerificationNote::Code::MISSING_FONT:
+		return String::compose("The font file for font ID \"%1\" was not found, or was not referred to in the ASSETMAP.", note.note().get());
+	case VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE:
+		return String::compose(
+			"Frame %1 has an image component that is too large (component %2 is %3 bytes in size).",
+			note.frame().get(), note.component().get(), note.size().get()
+			);
+	case VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT:
+		return String::compose("The XML in the subtitle asset %1 has more than one namespace declaration.", note.note().get());
+	case VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT:
+		return String::compose("A subtitle or closed caption refers to a font with ID %1 that does not have a corresponding <LoadFont> node", note.id().get());
+	case VerificationNote::Code::MISSING_LOAD_FONT:
+		return String::compose("The SMPTE subtitle asset %1 has <Text> nodes but no <LoadFont> node", note.id().get());
+	case VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
+		return String::compose("The asset with ID %1 in the asset map actually has an id of %2", note.id().get(), note.other_id().get());
+	case VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
+		return String::compose("The <LabelText> in a <ContentVersion> in CPL %1 is empty", note.id().get());
 	}
 
 	return "";