Add OK note when picture asset hashes are correct.

3 files changed, 76 insertions, 0 deletions

diff --git a/src/verify.cc b/src/verify.cc
index 85d09204..9756f9c7 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -619,6 +619,7 @@ verify_main_picture_asset(Context& context, shared_ptr<const ReelPictureAsset> r
 				context.error(VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file);
 				break;
 			default:
+				context.ok(VerificationNote::Code::CORRECT_PICTURE_HASH, file);
 				break;
 		}
 	}
@@ -1933,6 +1934,8 @@ dcp::note_to_string (VerificationNote note)
 		return String::compose("The picture in a reel has an invalid frame rate %1.", note.note().get());
 	case VerificationNote::Code::INCORRECT_PICTURE_HASH:
 		return String::compose("The hash (%1) of the picture asset %2 does not agree with the PKL file (%3).", note.calculated_hash().get(), note.file()->filename(), note.reference_hash().get());
+	case VerificationNote::Code::CORRECT_PICTURE_HASH:
+		return String::compose("The picture asset %1 has the expected hashes in the CPL and PKL.", note.file()->filename());
 	case VerificationNote::Code::MISMATCHED_PICTURE_HASHES:
 		return String::compose("The PKL and CPL hashes differ for the picture asset %1.", note.file()->filename());
 	case VerificationNote::Code::INCORRECT_SOUND_HASH:
diff --git a/src/verify.h b/src/verify.h
index eeda0b7a..339f4186 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -114,6 +114,7 @@ public:
 		 *  note contains the invalid frame rate as "<numerator>/<denominator>"
 		 */
 		INVALID_PICTURE_FRAME_RATE,
+		CORRECT_PICTURE_HASH,
 		/** The hash of a main picture asset does not agree with the PKL file
 		 *  file contains the picture asset filename
 		 *  calculated_hash contains the current hash of the picture MXF
diff --git a/test/verify_test.cc b/test/verify_test.cc
index a34708b2..2a2f7223 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -527,6 +527,7 @@ BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
 		{ dir },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
@@ -575,6 +576,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_rate)
 
 	std::vector<dcp::VerificationNote> expected =
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
@@ -637,6 +639,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_standard)
 	auto cpl = std::make_shared<dcp::CPL>(cpl_path);
 
 	std::vector<dcp::VerificationNote> expected = {
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_STANDARD },
@@ -681,6 +684,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
 	auto cpl = std::make_shared<dcp::CPL>(cpl_path);
 
 	std::vector<dcp::VerificationNote> expected = {
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
@@ -706,6 +710,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_issue_date)
 	auto cpl = std::make_shared<dcp::CPL>(cpl_path);
 
 	std::vector<dcp::VerificationNote> expected = {
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			dcp::VerificationNote(
@@ -734,6 +739,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 	auto cpl = std::make_shared<dcp::CPL>(cpl_path);
 
 	std::vector<dcp::VerificationNote> expected = {
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
@@ -761,6 +767,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
 	auto cpl = std::make_shared<dcp::CPL>(cpl_path);
 
 	std::vector<dcp::VerificationNote> expected = {
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
@@ -829,6 +836,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"), cpl)
 	};
 
@@ -856,6 +864,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_duration)
 	vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "j2c_d7576dcb-a361-4139-96b8-267f5f8d7f91.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "j2c_d7576dcb-a361-4139-96b8-267f5f8d7f91.mxf"), cpl),
 		{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
 		dcp::VerificationNote(
@@ -927,6 +936,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
 	vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "pic.mxf"), cpl),
 	};
 
 	for (auto i = 0; i < 24; ++i) {
@@ -974,6 +984,7 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
 	auto cpl = dcp_from_frame (oversized_frame, dir);
 
 	vector<dcp::VerificationNote> expected = {
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "pic.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 	};
@@ -1019,6 +1030,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_picture_frame_size_in_bytes)
 		{ dir },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "pic.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "pic.mxf"), cpl),
@@ -1426,6 +1438,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 		{ dir },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "pic.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "pic.mxf"), cpl),
 			dcp::VerificationNote(
@@ -1584,6 +1597,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 		{ dir },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "videofoo.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "videofoo.mxf"), cpl),
@@ -1671,6 +1685,7 @@ check_picture_size_ok (int width, int height, int frame_rate, bool three_d)
 	std::vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl)
 	};
 	check_verify_result(notes, expected);
@@ -1689,6 +1704,7 @@ check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool t
 	std::vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 		dcp::VerificationNote(
 			dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_SIZE_IN_PIXELS, dcp::String::compose("%1x%2", width, height), canonical(dir / "video.mxf")
@@ -1710,6 +1726,7 @@ check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, boo
 	std::vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 		dcp::VerificationNote(
 			dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE, dcp::String::compose("%1/1", frame_rate * (three_d ? 2 : 1))
@@ -1735,6 +1752,7 @@ check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, boo
 	std::vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 		dcp::VerificationNote(
 			dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_4K, dcp::String::compose("%1/1", frame_rate), canonical(dir / "video.mxf")
@@ -1795,6 +1813,7 @@ BOOST_AUTO_TEST_CASE (verify_picture_size)
 	std::vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 		{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D },
 	};
@@ -1982,6 +2001,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 		{
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")
@@ -2026,6 +2046,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		{ path },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video0.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video0.mxf"), cpl),
@@ -2078,6 +2100,8 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		{
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video0.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video0.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl),
 			dcp::VerificationNote(
@@ -2133,6 +2157,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 		{ dir },
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
@@ -2192,6 +2217,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
@@ -2961,6 +2987,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "videofoo.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "videofoo.mxf"), cpl),
 			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()),
@@ -2995,6 +3022,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
@@ -3027,6 +3055,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
@@ -3067,6 +3096,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION
 				).set_cpl_id(cpl->id()),
@@ -3147,6 +3177,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS
 					).set_cpl_id(cpl->id()),
@@ -3168,6 +3200,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
 					).set_cpl_id(cpl->id())
@@ -3185,6 +3219,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
 					).set_cpl_id(cpl->id())
@@ -3261,6 +3297,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS
 					).set_cpl_id(cpl->id()),
@@ -3281,6 +3319,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
 					).set_cpl_id(cpl->id())
@@ -3298,6 +3338,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video1.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl),
 				ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl),
+				ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl),
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
 					).set_cpl_id(cpl->id())
@@ -3346,6 +3388,7 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, code, subs->id()
@@ -3420,6 +3463,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
@@ -3453,6 +3497,7 @@ verify_markers_test (
 		note.set_cpl_id(cpl->id());
 	}
 
+	test_notes.push_back(ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl));
 	test_notes.push_back(ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl));
 	test_notes.push_back(ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl));
 	test_notes.push_back(ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl));
@@ -3556,6 +3601,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 		{dir},
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
@@ -3588,6 +3634,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3619,6 +3666,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3651,6 +3699,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3684,6 +3733,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3715,6 +3765,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3747,6 +3798,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3781,6 +3833,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3813,6 +3866,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3847,6 +3901,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			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()),
@@ -3886,6 +3941,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::ALL_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl_path)
@@ -3937,6 +3993,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::ALL_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			dcp::VerificationNote(
@@ -3983,6 +4040,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_unencrypted_content)
 		{dir},
 		{},
 		{
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
@@ -4054,6 +4112,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED
@@ -4267,6 +4326,7 @@ BOOST_AUTO_TEST_CASE (verify_threed_marked_as_twod)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "0d6f57e6-adac-4e1d-bfbe-d162bf13e2cd_j2c.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "0d6f57e6-adac-4e1d-bfbe-d162bf13e2cd_j2c.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 			dcp::VerificationNote(
@@ -4306,6 +4366,7 @@ BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
@@ -4341,6 +4402,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
@@ -4374,6 +4436,7 @@ BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
@@ -4408,6 +4471,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
@@ -4448,6 +4512,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
 		{},
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
@@ -4597,7 +4662,9 @@ BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video2.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video2.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2"))
@@ -4654,6 +4721,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl),
 			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))
@@ -4714,6 +4782,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 
 	vector<dcp::VerificationNote> expected = {
 		ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
+		ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(path / "video.mxf"), cpl),
 		ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
 		dcp::VerificationNote(
 			dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
@@ -4765,6 +4834,7 @@ BOOST_AUTO_TEST_CASE(verify_too_many_subtitle_namespaces)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "j2c_42b34dcd-caa5-4c7b-aa0f-66a590947ba1.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "j2c_42b34dcd-caa5-4c7b-aa0f-66a590947ba1.mxf"), cpl),
 			dcp::VerificationNote(
 				dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
@@ -4859,6 +4929,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id()).set_cpl_id(cpl->id())
 		});
@@ -4911,6 +4982,7 @@ BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
 		{
 			ok(dcp::VerificationNote::Code::NONE_ENCRYPTED, cpl),
 			ok(dcp::VerificationNote::Code::MATCHING_CPL_HASHES, cpl),
+			ok(dcp::VerificationNote::Code::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl),
 			ok(dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl),
 			dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_cpl_id(cpl->id())
 		});