diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-12 20:52:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-17 20:13:22 +0100 |
| commit | 23e8b88797af2e6344f769cac05018da479e2da5 (patch) | |
| tree | 4bd85a554976e99c884c7538bf5c659a6c3f7e56 | |
| parent | ab9d9fe2f33bf5fadb0132120111e0e73c86ca09 (diff) | |
Rename some notes to clarify places where size refers to bytes, not pixels.
| -rw-r--r-- | src/verify.cc | 8 | ||||
| -rw-r--r-- | src/verify.h | 4 | ||||
| -rw-r--r-- | test/verify_test.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/verify.cc b/src/verify.cc index 363264db..d78e6462 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -507,14 +507,14 @@ verify_main_picture_asset ( case VERIFY_PICTURE_ASSET_RESULT_BAD: notes.push_back ( VerificationNote( - VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_FRAME_TOO_LARGE, file + VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES, file ) ); break; case VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE: notes.push_back ( VerificationNote( - VerificationNote::VERIFY_WARNING, VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE, file + VerificationNote::VERIFY_WARNING, VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES, file ) ); break; @@ -758,9 +758,9 @@ dcp::note_to_string (dcp::VerificationNote note) return String::compose("The intrinsic duration of an asset is less than 1 second long: %1", note.note().get()); case dcp::VerificationNote::DURATION_TOO_SMALL: return String::compose("The duration of an asset is less than 1 second long: %1", note.note().get()); - case dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE: + case dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES: return String::compose("The instantaneous bit rate of the picture asset %1 is larger than the limit of 250Mbit/s in at least one place.", note.file()->filename()); - case dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE: + case dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES: return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place.", note.file()->filename()); case dcp::VerificationNote::EXTERNAL_ASSET: return String::compose("An asset that this DCP refers to is not included in the DCP. It may be a VF. Missing asset is %1.", note.note().get()); diff --git a/src/verify.h b/src/verify.h index 8eb5aa12..24a9e671 100644 --- a/src/verify.h +++ b/src/verify.h @@ -85,9 +85,9 @@ public: /** An asset's Duration is less than 1 second */ DURATION_TOO_SMALL, /** The JPEG2000 data in at least one picture frame is larger than the equivalent of 250Mbit/s */ - PICTURE_FRAME_TOO_LARGE, + PICTURE_FRAME_TOO_LARGE_IN_BYTES, /** The JPEG2000 data in at least one picture frame is larger than the equivalent of 230Mbit/s */ - PICTURE_FRAME_NEARLY_TOO_LARGE, + PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES, /** An asset that the CPL requires is not in this DCP; the DCP may be a VF */ EXTERNAL_ASSET, /** DCP is Interop, not SMPTE [Bv2.1_6.1] */ diff --git a/test/verify_test.cc b/test/verify_test.cc index 438dbbd6..e74a737a 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE (verify_test15) dirs.push_back (dir); list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test); BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES); } @@ -601,7 +601,7 @@ BOOST_AUTO_TEST_CASE (verify_test16) dirs.push_back (dir); list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test); BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES); } |
