diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-29 20:51:11 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | fda76ce499bd7db31301383726fd4772fd08ca72 (patch) | |
| tree | acf963208e1124640f1df23e0351c22a316dc991 | |
| parent | 2835cd88ff5ddd9dc5ad4bf7e5eaefe7cc4b6a99 (diff) | |
MISSING_HASH: note -> asset_id.
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | src/verify.h | 2 | ||||
| -rw-r--r-- | test/verify_test.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/verify.cc b/src/verify.cc index 2d3031d5..6b86958d 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1425,7 +1425,7 @@ verify_reel( context.add_note(VerificationNote(VerificationNote::Code::INVALID_INTRINSIC_DURATION).set_asset_id(i->id())); } if (i->encryptable() && !i->hash()) { - context.add_note(VerificationNote::Code::MISSING_HASH, i->id()); + context.add_note(VerificationNote(VerificationNote::Code::MISSING_HASH).set_asset_id(i->id())); } } @@ -2082,7 +2082,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT: return compose("The closed caption asset %1 has an <EntryPoint> other than 0.", *note.asset_id()); case VerificationNote::Code::MISSING_HASH: - return compose("The asset %1 has no <Hash> tag in the CPL.", note.note().get()); + return compose("The asset %1 has no <Hash> tag in the CPL.", *note.asset_id()); case VerificationNote::Code::MISSING_FFEC_IN_FEATURE: return process_string("The DCP is marked as a Feature but there is no FFEC (first frame of end credits) marker."); case VerificationNote::Code::MISSING_FFMC_IN_FEATURE: diff --git a/src/verify.h b/src/verify.h index ba726349..8a6bcfe9 100644 --- a/src/verify.h +++ b/src/verify.h @@ -336,7 +336,7 @@ public: */ INCORRECT_CLOSED_CAPTION_ENTRY_POINT, /** _<Hash>_ must be present for assets in CPLs - * note contains the asset ID + * asset_id contains the asset ID * reel_index contains the reel index (starting from 0) */ MISSING_HASH, diff --git a/test/verify_test.cc b/test/verify_test.cc index 2b555ed3..20206c0b 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -4026,7 +4026,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash) VN( VC::MISMATCHED_CPL_HASHES, cpl->file().get() ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()), - VN(VC::MISSING_HASH, asset_id).set_cpl_id(cpl->id()).set_reel_index(0) + VN(VC::MISSING_HASH).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset_id), }); } @@ -5936,8 +5936,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_sound_bit_depth) VN( VC::INVALID_SOUND_BIT_DEPTH, canonical(dir / "Audio.mxf") ).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id("9d5e8bc4-676b-4306-a86d-03f70c73b457").set_bit_depth(16), - VN(VC::MISSING_HASH, string("fd4796c2-9c84-454c-91f4-13ad127cea8a")).set_cpl_id(cpl->id()).set_reel_index(0), - VN(VC::MISSING_HASH, string("9d5e8bc4-676b-4306-a86d-03f70c73b457")).set_cpl_id(cpl->id()).set_reel_index(0), + VN(VC::MISSING_HASH).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id("fd4796c2-9c84-454c-91f4-13ad127cea8a"), + VN(VC::MISSING_HASH).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id("9d5e8bc4-676b-4306-a86d-03f70c73b457"), VN(VC::MISSING_CPL_METADATA, canonical(cpl->file().get())).set_cpl_id(cpl->id()), VN(VC::MISSING_FFOC).set_cpl_id(cpl->id()), VN(VC::MISSING_LFOC).set_cpl_id(cpl->id()), |