diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-28 01:01:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-28 01:01:55 +0100 |
| commit | 9d3e7f716accd67985f23048b4c36e7581348848 (patch) | |
| tree | 1b315668cda8d42dd6da9658537274908b76a552 | |
| parent | 4587644ad4888ebb17a8368312e89da37eabc7be (diff) | |
Fix erroneous reports of unresolved assets when checking OV/VF pairs.v1.6.17
| -rw-r--r-- | src/verify.cc | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/verify.cc b/src/verify.cc index 4a656874..0445a854 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -140,24 +140,26 @@ dcp::verify (vector<boost::filesystem::path> directories, function<void (string, notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_RATE)); } /* Check asset */ - stage ("Checking picture asset hash", reel->main_picture()->asset()->file()); - Result const r = verify_asset (dcp, reel->main_picture(), progress); - switch (r) { - case RESULT_BAD: - notes.push_back ( - VerificationNote( - VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_HASH_INCORRECT, *reel->main_picture()->asset()->file() - ) - ); - break; - case RESULT_CPL_PKL_DIFFER: - notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE)); - break; - default: - break; + if (reel->main_picture()->asset_ref().resolved()) { + stage ("Checking picture asset hash", reel->main_picture()->asset()->file()); + Result const r = verify_asset (dcp, reel->main_picture(), progress); + switch (r) { + case RESULT_BAD: + notes.push_back ( + VerificationNote( + VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_HASH_INCORRECT, *reel->main_picture()->asset()->file() + ) + ); + break; + case RESULT_CPL_PKL_DIFFER: + notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE)); + break; + default: + break; + } } } - if (reel->main_sound()) { + if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) { stage ("Checking sound asset hash", reel->main_sound()->asset()->file()); Result const r = verify_asset (dcp, reel->main_sound(), progress); switch (r) { |