Tidy up parameters in VerificationNote.

3 files changed, 210 insertions, 108 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index ee1a64ed..11721b78 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -192,14 +192,14 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 			   claims to come from ClipsterDCI 5.10.0.5.
 			*/
 			if (notes) {
-				notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EMPTY_ASSET_PATH));
+				notes->push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::EMPTY_ASSET_PATH});
 			}
 			continue;
 		}
 
 		if (!boost::filesystem::exists(path)) {
 			if (notes) {
-				notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSET, path));
+				notes->push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSET, path});
 			}
 			continue;
 		}
@@ -235,7 +235,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 			if (root == "CompositionPlaylist") {
 				auto cpl = make_shared<CPL>(path);
 				if (_standard && cpl->standard() && cpl->standard().get() != _standard.get() && notes) {
-					notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD));
+					notes->push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD});
 				}
 				_cpls.push_back (cpl);
 			} else if (root == "DCSubtitle") {
diff --git a/src/verify.cc b/src/verify.cc
index 0fcb8835..37bad761 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -343,15 +343,13 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<Verificat
 	XMLPlatformUtils::Terminate ();
 
 	for (auto i: error_handler.errors()) {
-		notes.push_back (
-			VerificationNote(
-				VerificationNote::VERIFY_ERROR,
-				VerificationNote::INVALID_XML,
-				i.message(),
-				boost::trim_copy(i.public_id() + " " + i.system_id()),
-				i.line()
-				)
-			);
+		notes.push_back ({
+			VerificationNote::VERIFY_ERROR,
+			VerificationNote::INVALID_XML,
+			i.message(),
+			boost::trim_copy(i.public_id() + " " + i.system_id()),
+			i.line()
+		});
 	}
 }
 
@@ -507,18 +505,14 @@ verify_main_picture_asset (
 	auto const pr = verify_picture_asset (reel_asset, progress);
 	switch (pr) {
 		case VERIFY_PICTURE_ASSET_RESULT_BAD:
-			notes.push_back (
-				VerificationNote(
-					VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
-					)
-				);
+			notes.push_back ({
+				VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+			});
 			break;
 		case VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE:
-			notes.push_back (
-				VerificationNote(
-					VerificationNote::VERIFY_WARNING, VerificationNote::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
-					)
-				);
+			notes.push_back ({
+				VerificationNote::VERIFY_WARNING, VerificationNote::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+			});
 			break;
 		default:
 			break;
@@ -574,6 +568,7 @@ verify_main_picture_asset (
 				VerificationNote(
 					VerificationNote::VERIFY_BV21_ERROR,
 					VerificationNote::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D,
+					String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
 					file
 					)
 				);
@@ -621,7 +616,7 @@ verify_main_sound_asset (
 	if (asset->sampling_rate() != 48000) {
 		notes.push_back (
 			VerificationNote(
-				VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_SOUND_FRAME_RATE, *asset->file()
+				VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), *asset->file()
 				)
 			);
 	}
@@ -637,9 +632,9 @@ verify_main_subtitle_reel (shared_ptr<const ReelSubtitleAsset> reel_asset, vecto
 	}
 
 	if (!reel_asset->entry_point()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_ENTRY_POINT });
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_ENTRY_POINT, reel_asset->id() });
 	} else if (reel_asset->entry_point().get()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_SUBTITLE_ENTRY_POINT });
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_SUBTITLE_ENTRY_POINT, reel_asset->id() });
 	}
 }
 
@@ -653,9 +648,9 @@ verify_closed_caption_reel (shared_ptr<const ReelClosedCaptionAsset> reel_asset,
 	}
 
 	if (!reel_asset->entry_point()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CLOSED_CAPTION_ENTRY_POINT });
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
 	} else if (reel_asset->entry_point().get()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_CLOSED_CAPTION_ENTRY_POINT });
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
 	}
 }
 
@@ -685,8 +680,11 @@ verify_smpte_subtitle_asset (
 	} else {
 		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_LANGUAGE, *asset->file() });
 	}
-	if (boost::filesystem::file_size(asset->file().get()) > 115 * 1024 * 1024) {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_SIZE_IN_BYTES, *asset->file() });
+	auto const size = boost::filesystem::file_size(asset->file().get());
+	if (size > 115 * 1024 * 1024) {
+		notes.push_back (
+			{ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_SIZE_IN_BYTES, raw_convert<string>(size), *asset->file() }
+			);
 	}
 	/* XXX: I'm not sure what Bv2.1_7.2.1 means when it says "the font resource shall not be larger than 10MB"
 	 * but I'm hoping that checking for the total size of all fonts being <= 10MB will do.
@@ -697,7 +695,7 @@ verify_smpte_subtitle_asset (
 		total_size += i.second.size();
 	}
 	if (total_size > 10 * 1024 * 1024) {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, asset->file().get() });
+		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, raw_convert<string>(total_size), asset->file().get() });
 	}
 
 	if (!asset->start_time()) {
@@ -744,7 +742,7 @@ verify_closed_caption_asset (
 	if (asset->raw_xml().size() > 256 * 1024) {
 		notes.push_back (
 			VerificationNote(
-				VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, *asset->file()
+				VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, raw_convert<string>(asset->raw_xml().size()), *asset->file()
 				)
 			);
 	}
@@ -814,27 +812,21 @@ check_text_timing (
 	}
 
 	if (too_early) {
-		notes.push_back(
-			VerificationNote(
-				VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME
-				)
-			);
+		notes.push_back({
+			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME
+		});
 	}
 
 	if (too_short) {
-		notes.push_back (
-			VerificationNote(
-				VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_DURATION
-				)
-			);
+		notes.push_back ({
+			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_DURATION
+		});
 	}
 
 	if (too_close) {
-		notes.push_back (
-			VerificationNote(
-				VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_SPACING
-				)
-			);
+		notes.push_back ({
+			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_SPACING
+		});
 	}
 }
 
@@ -1032,9 +1024,9 @@ check_extension_metadata (shared_ptr<CPL> cpl, vector<VerificationNote>& notes)
 	}
 
 	if (missing) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_EXTENSION_METADATA});
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get()});
 	} else if (!malformed.empty()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_EXTENSION_METADATA, malformed});
+		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_EXTENSION_METADATA, malformed, cpl->file().get()});
 	}
 }
 
@@ -1133,9 +1125,9 @@ dcp::verify (
 
 			if (dcp->standard() == SMPTE) {
 				if (!cpl->annotation_text()) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_ANNOTATION_TEXT));
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
 				} else if (cpl->annotation_text().get() != cpl->content_title_text()) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::MISMATCHED_CPL_ANNOTATION_TEXT));
+					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
 				}
 			}
 
@@ -1143,7 +1135,7 @@ dcp::verify (
 				/* Check that the CPL's hash corresponds to the PKL */
 				optional<string> h = i->hash(cpl->id());
 				if (h && make_digest(ArrayData(*cpl->file())) != *h) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_CPL_HASHES));
+					notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()));
 				}
 
 				/* Check that any PKL with a single CPL has its AnnotationText the same as the CPL's ContentTitleText */
@@ -1164,7 +1156,7 @@ dcp::verify (
 				}
 
 				if (required_annotation_text && i->annotation_text() != required_annotation_text) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->file().get()});
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()});
 				}
 			}
 
@@ -1200,7 +1192,7 @@ dcp::verify (
 						if (!duration) {
 							duration = i->actual_duration();
 						} else if (*duration != i->actual_duration()) {
-							notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_ASSET_DURATION));
+							notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_ASSET_DURATION});
 							break;
 						}
 					}
@@ -1217,7 +1209,11 @@ dcp::verify (
 					     frame_rate.numerator != 50 &&
 					     frame_rate.numerator != 60 &&
 					     frame_rate.numerator != 96)) {
-						notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_RATE));
+						notes.push_back ({
+							VerificationNote::VERIFY_ERROR,
+							VerificationNote::INVALID_PICTURE_FRAME_RATE,
+							String::compose("%1/%2", frame_rate.numerator, frame_rate.denominator)
+						});
 					}
 					/* Check asset */
 					if (reel->main_picture()->asset_ref().resolved()) {
@@ -1279,14 +1275,17 @@ dcp::verify (
 				if (ffoc == markers_seen.end()) {
 					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISSING_FFOC});
 				} else if (ffoc->second.e != 1) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_FFOC});
+					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
 				}
 
 				auto lfoc = markers_seen.find(Marker::LFOC);
 				if (lfoc == markers_seen.end()) {
 					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISSING_LFOC});
-				} else if (lfoc->second.as_editable_units(lfoc->second.tcr) != (cpl->reels().back()->duration() - 1)) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_LFOC});
+				} else {
+					auto lfoc_time = lfoc->second.as_editable_units(lfoc->second.tcr);
+					if (lfoc_time != (cpl->reels().back()->duration() - 1)) {
+						notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
+					}
 				}
 
 				check_text_timing (cpl->reels(), notes);
@@ -1299,7 +1298,7 @@ dcp::verify (
 				}
 
 				if (result.line_count_exceeded) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_LINE_COUNT));
+					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_LINE_COUNT});
 				}
 				if (result.error_length_exceeded) {
 					notes.push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_LINE_LENGTH));
@@ -1317,19 +1316,19 @@ dcp::verify (
 				}
 
 				if (result.line_count_exceeded) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT));
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT});
 				}
 				if (result.error_length_exceeded) {
-					notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_LENGTH));
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_LENGTH});
 				}
 
 				if (!cpl->full_content_title_text()) {
 					/* Since FullContentTitleText is assumed always to exist if there's a CompositionMetadataAsset we
 					 * can use it as a proxy for CompositionMetadataAsset's existence.
 					 */
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA});
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get()});
 				} else if (!cpl->version_number()) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER});
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get()});
 				}
 
 				check_extension_metadata (cpl, notes);
@@ -1339,7 +1338,7 @@ dcp::verify (
 					DCP_ASSERT (cpl->file());
 					doc.read_file (cpl->file().get());
 					if (!doc.optional_node_child("Signature")) {
-						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->file().get()});
+						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
 					}
 				}
 			}
@@ -1352,7 +1351,7 @@ dcp::verify (
 				cxml::Document doc ("PackingList");
 				doc.read_file (pkl->file().get());
 				if (!doc.optional_node_child("Signature")) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->file().get()});
+					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
 				}
 			}
 		}
diff --git a/src/verify.h b/src/verify.h
index 11f879ff..ad733b01 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -73,68 +73,127 @@ public:
 	 *
 	 *  Comments should clarify meaning and also say which of the optional fields (e.g. file)
 	 *  are filled in when this code is used.
-	 *  XXX: this needs checking.
 	 */
 	enum Code {
-		/** An error when reading the DCP.  note contains (probably technical) details. */
+		/** An error when reading the DCP.
+		 *  note contains (probably technical) details.
+		 */
 		FAILED_READ,
-		/** The hash of the CPL in the PKL does not agree with the CPL file */
+		/** The hash of the CPL in the PKL does not agree with the CPL file.
+		 *  note contains CPL ID.
+		 *  file contains CPL filename.
+		 */
 		MISMATCHED_CPL_HASHES,
-		/** Frame rate given in a reel for the main picture is not 24, 25, 30, 48, 50 or 60 */
+		/** Frame rate given in a reel for the main picture is not 24, 25, 30, 48, 50 or 60.
+		 *  note contains the invalid frame rate as "<numerator>/<denominator>"
+		 */
 		INVALID_PICTURE_FRAME_RATE,
-		/** The hash of a main picture asset does not agree with the PKL file.  file contains the picture asset filename. */
+		/** The hash of a main picture asset does not agree with the PKL file.
+		 *  file contains the picture asset filename.
+		 */
 		INCORRECT_PICTURE_HASH,
-		/** The hash of a main picture is different in the CPL and PKL */
+		/** The hash of a main picture is different in the CPL and PKL.
+		 *  file contains the picture asset filename.
+		 */
 		MISMATCHED_PICTURE_HASHES,
-		/** The hash of a main sound asset does not agree with the PKL file.  file contains the sound asset filename. */
+		/** The hash of a main sound asset does not agree with the PKL file.
+		 *  file contains the sound asset filename.
+		 */
 		INCORRECT_SOUND_HASH,
-		/** The hash of a main sound is different in the CPL and PKL */
+		/** The hash of a main sound is different in the CPL and PKL.
+		 *  file contains the sound asset filename.
+		 */
 		MISMATCHED_SOUND_HASHES,
-		/** An assetmap's <Path> entry is empty */
+		/** An assetmap's <Path> entry is empty. */
 		EMPTY_ASSET_PATH,
-		/** A file mentioned in an asset map cannot be found */
+		/** A file mentioned in an asset map cannot be found.
+		 *  file contains the filename that is missing.
+		 */
 		MISSING_ASSET,
 		/** The DCP contains both SMPTE and Interop-standard components */
 		MISMATCHED_STANDARD,
-		/** Some XML fails to validate against the XSD/DTD */
+		/** Some XML fails to validate against the XSD/DTD.
+		 *  note contains the (probably technical) details.
+		 *  file contains the invalid filename.
+		 *  line contains the line number.
+		 */
 		INVALID_XML,
 		/** No ASSETMAP{.xml} was found */
 		MISSING_ASSETMAP,
-		/** An asset's IntrinsicDuration is less than 1 second */
+		/** An asset's IntrinsicDuration is less than 1 second.
+		 *  note contains asset ID.
+		 */
 		INVALID_INTRINSIC_DURATION,
-		/** An asset's Duration is less than 1 second */
+		/** An asset's Duration is less than 1 second.
+		 *  note contains asset ID.
+		 */
 		INVALID_DURATION,
-		/** The JPEG2000 data in at least one picture frame is larger than the equivalent of 250Mbit/s */
+		/** The JPEG2000 data in at least one picture frame is larger than the equivalent of 250Mbit/s.
+		 *  file contains the picture asset filename.
+		 */
 		INVALID_PICTURE_FRAME_SIZE_IN_BYTES,
-		/** The JPEG2000 data in at least one picture frame is larger than the equivalent of 230Mbit/s */
+		/** The JPEG2000 data in at least one picture frame is larger than the equivalent of 230Mbit/s.
+		 *  file contains the picture asset filename.
+		 */
 		NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES,
-		/** An asset that the CPL requires is not in this DCP; the DCP may be a VF */
+		/** An asset that the CPL requires is not in this DCP; the DCP may be a VF.
+		 *  note contains the asset ID.
+		 */
 		EXTERNAL_ASSET,
 		/** DCP is Interop, not SMPTE [Bv2.1_6.1] */
 		INVALID_STANDARD,
-		/** A language or territory does not conform to RFC 5646 [Bv2.1_6.2.1] */
+		/** A language or territory does not conform to RFC 5646 [Bv2.1_6.2.1].
+		 *  note contains the invalid language.
+		 */
 		INVALID_LANGUAGE,
-		/** A picture asset does not have one of the required Bv2.1 sizes (in pixels) [Bv2.1_7.1] */
+		/** A picture asset does not have one of the required Bv2.1 sizes (in pixels) [Bv2.1_7.1].
+		 *  note contains the incorrect size as "<width>x<height>"
+		 *  file contains the asset filename.
+		 */
 		INVALID_PICTURE_SIZE_IN_PIXELS,
-		/** A picture asset is 2K but is not at 24, 25 or 48 fps as required by Bv2.1 [Bv2.1_7.1] */
+		/** A picture asset is 2K but is not at 24, 25 or 48 fps as required by Bv2.1 [Bv2.1_7.1].
+		 *  note contains the invalid frame rate as "<numerator>/<denominator>"
+		 *  file contains the asset filename.
+		 */
 		INVALID_PICTURE_FRAME_RATE_FOR_2K,
-		/** A picture asset is 4K but is not at 24fps as required by Bv2.1 [Bv2.1_7.1] */
+		/** A picture asset is 4K but is not at 24fps as required by Bv2.1 [Bv2.1_7.1]
+		 *  note contains the invalid frame rate as "<numerator>/<denominator>"
+		 *  file contains the asset filename.
+		 */
 		INVALID_PICTURE_FRAME_RATE_FOR_4K,
-		/** A picture asset is 4K but is 3D which is not allowed by Bv2.1 [Bv2.1_7.1] */
+		/** A picture asset is 4K but is 3D which is not allowed by Bv2.1 [Bv2.1_7.1]
+		 *  note contains the invalid frame rate as "<numerator>/<denominator>"
+		 *  file contains the asset filename.
+		 */
 		INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D,
-		/** A closed caption's XML file is larger than 256KB [Bv2.1_7.2.1] */
+		/** A closed caption's XML file is larger than 256KB [Bv2.1_7.2.1].
+		 *  note contains the invalid size in bytes.
+		 *  file contains the asset filename.
+		 */
 		INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
-		/** Any timed text asset's total files is larger than 115MB [Bv2.1_7.2.1] */
+		/** Any timed text asset's total files is larger than 115MB [Bv2.1_7.2.1]
+		 *  note contains the invalid size in bytes.
+		 *  file contains the asset filename.
+		 */
 		INVALID_TIMED_TEXT_SIZE_IN_BYTES,
-		/** The total size of all a timed text asset's fonts is larger than 10MB [Bv2.1_7.2.1] */
+		/** The total size of all a timed text asset's fonts is larger than 10MB [Bv2.1_7.2.1]
+		 *  note contains the invalid size in bytes.
+		 *  file contains the asset filename.
+		 */
 		INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES,
-		/** Some SMPTE subtitle XML has no <Language> tag [Bv2.1_7.2.2] */
+		/** Some SMPTE subtitle XML has no <Language> tag [Bv2.1_7.2.2]
+		 *  file contains the asset filename.
+		 */
 		MISSING_SUBTITLE_LANGUAGE,
 		/** Not all subtitle assets specify the same <Language> tag [Bv2.1_7.2.2] */
 		MISMATCHED_SUBTITLE_LANGUAGES,
-		/** Some SMPTE subtitle XML has no <StartTime> tag [Bv2.1_7.2.3] */
+		/** Some SMPTE subtitle XML has no <StartTime> tag [Bv2.1_7.2.3]
+		 *  file contains the asset filename.
+		 */
 		MISSING_SUBTITLE_START_TIME,
-		/** Some SMPTE subtitle XML has a non-zero <StartTime> tag [Bv2.1_7.2.3] */
+		/** Some SMPTE subtitle XML has a non-zero <StartTime> tag [Bv2.1_7.2.3]
+		 *  file contains the asset filename.
+		 */
 		INVALID_SUBTITLE_START_TIME,
 		/** The first subtitle or closed caption happens before 4s into the first reel [Bv2.1_7.2.4] */
 		INVALID_SUBTITLE_FIRST_TEXT_TIME,
@@ -152,11 +211,20 @@ public:
 		INVALID_CLOSED_CAPTION_LINE_COUNT,
 		/** There are more than 32 characters in at least one closed caption line [Bv2.1_7.2.6] */
 		INVALID_CLOSED_CAPTION_LINE_LENGTH,
-		/** The audio sampling rate must be 48kHz [Bv2.1_7.3] */
+		/** The audio sampling rate must be 48kHz [Bv2.1_7.3].
+		 *  note contains the invalid frame rate.
+		 *  file contains the asset filename.
+		 */
 		INVALID_SOUND_FRAME_RATE,
-		/** The CPL has no <AnnotationText> tag [Bv2.1_8.1] */
+		/** The CPL has no <AnnotationText> tag [Bv2.1_8.1]
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		MISSING_CPL_ANNOTATION_TEXT,
-		/** The <AnnotationText> is not the same as the <ContentTitleText> [Bv2.1_8.1] */
+		/** The <AnnotationText> is not the same as the <ContentTitleText> [Bv2.1_8.1]
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		MISMATCHED_CPL_ANNOTATION_TEXT,
 		/** At least one asset in a reel does not have the same duration as the others */
 		MISMATCHED_ASSET_DURATION,
@@ -164,15 +232,25 @@ public:
 		MISSING_MAIN_SUBTITLE_FROM_SOME_REELS,
 		/** If one reel has at least one ClosedCaption, all reels must have the same number of ClosedCaptions */
 		MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS,
-		/** MainSubtitle in reels must have <EntryPoint> Bv2.1_8.3.2 */
+		/** MainSubtitle in reels must have <EntryPoint> Bv2.1_8.3.2
+		 *  note contains the asset ID
+		 */
 		MISSING_SUBTITLE_ENTRY_POINT,
-		/** MainSubtitle <EntryPoint> must be zero Bv2.1_8.3.2 */
+		/** MainSubtitle <EntryPoint> must be zero Bv2.1_8.3.2
+		 *  note contains the asset ID
+		 */
 		INCORRECT_SUBTITLE_ENTRY_POINT,
-		/** Closed caption in reels must have <EntryPoint> Bv2.1_8.3.2 */
+		/** Closed caption in reels must have <EntryPoint> Bv2.1_8.3.2
+		 *  note contains the asset ID
+		 */
 		MISSING_CLOSED_CAPTION_ENTRY_POINT,
-		/** Closed caption MainSubtitle <EntryPoint> must be zero Bv2.1_8.3.2 */
+		/** Closed caption MainSubtitle <EntryPoint> must be zero Bv2.1_8.3.2
+		 *  note contains the asset ID
+		 */
 		INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
-		/** <Hash> must be present for assets in CPLs */
+		/** <Hash> must be present for assets in CPLs.
+		 * note contains the asset ID
+		 */
 		MISSING_HASH,
 		/** If ContentKind is Feature there must be a FFEC marker */
 		MISSING_FFEC_IN_FEATURE,
@@ -182,23 +260,48 @@ public:
 		MISSING_FFOC,
 		/** There should be a LFOC */
 		MISSING_LFOC,
-		/** The FFOC should be 1 */
+		/** The FFOC should be 1.
+		 *  note contains the incorrect value.
+		 */
 		INCORRECT_FFOC,
-		/** The LFOC should be the last frame in the reel */
+		/** The LFOC should be the last frame in the reel
+		 *  note contains the incorrect value.
+		 */
 		INCORRECT_LFOC,
-		/** There must be a <CompositionMetadataAsset> */
+		/** There must be a <CompositionMetadataAsset>
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		MISSING_CPL_METADATA,
-		/** CPL metadata should contain <VersionNumber> of 1, at least */
+		/** CPL metadata should contain <VersionNumber> of 1, at least
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		MISSING_CPL_METADATA_VERSION_NUMBER,
-		/** There must be an <ExtensionMetadata> in <CompositionMetadataAsset> Bv2.1_8.6.3 */
+		/** There must be an <ExtensionMetadata> in <CompositionMetadataAsset> Bv2.1_8.6.3
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		MISSING_EXTENSION_METADATA,
-		/** <ExtensionMetadata> must have a particular form Bv2.1_8.6.3 */
+		/** <ExtensionMetadata> must have a particular form Bv2.1_8.6.3
+		 *  note contains details of what's wrong
+		 *  file contains the CPL filename.
+		 */
 		INVALID_EXTENSION_METADATA,
-		/** CPLs containing encrypted content must be signed Bv2.1_8.7 */
+		/** CPLs containing encrypted content must be signed Bv2.1_8.7
+		 *  note contains the CPL ID.
+		 *  file contains the CPL filename.
+		 */
 		UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT,
-		/** PKLs containing encrypted content must be signed Bv2.1_8.7 */
+		/** PKLs containing encrypted content must be signed Bv2.1_8.7
+		 *  note contains the PKL ID.
+		 *  file contains the PKL filename.
+		 */
 		UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT,
-		/** If a PKL has one CPL its <ContentTitleText> must be the same as the PKL's <AnnotationText> */
+		/** If a PKL has one CPL its <ContentTitleText> must be the same as the PKL's <AnnotationText>.
+		 *  note contains the PKL ID.
+		 *  file contains the PKL filename.
+		 */
 		MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL,
 		/** If any content is encrypted, everything must be encrypted */
 		PARTIALLY_ENCRYPTED,