X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fverify_test.cc;h=98a28cbc3635d960b0f39478612b9a342a9750c4;hb=a79574aab09f3908d228b715ebbc8a2ebb16f7fb;hp=9b9111d2cf2ee1501045c42ae64b67ae9e287897;hpb=9e613ae8a3cd7994194d2d709f6ff9b88feac70b;p=libdcp.git diff --git a/test/verify_test.cc b/test/verify_test.cc index 9b9111d2..98a28cbc 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of libdcp. @@ -36,13 +36,17 @@ #include "j2k.h" #include "reel.h" #include "reel_mono_picture_asset.h" +#include "reel_sound_asset.h" #include "cpl.h" #include "dcp.h" #include "openjpeg_image.h" #include "mono_picture_asset.h" +#include "stereo_picture_asset.h" #include "mono_picture_asset_writer.h" #include "interop_subtitle_asset.h" #include "smpte_subtitle_asset.h" +#include "reel_closed_caption_asset.h" +#include "reel_stereo_picture_asset.h" #include "reel_subtitle_asset.h" #include "compose.hpp" #include "test.h" @@ -57,8 +61,9 @@ using std::pair; using std::string; using std::vector; using std::make_pair; +using std::make_shared; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; static list > > stages; @@ -75,19 +80,39 @@ progress (float) } +static void +prepare_directory (boost::filesystem::path path) +{ + using namespace boost::filesystem; + remove_all (path); + create_directories (path); +} + + static vector setup (int reference_number, int verify_test_number) { - boost::filesystem::remove_all (dcp::String::compose("build/test/verify_test%1", verify_test_number)); - boost::filesystem::create_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number)); - for (boost::filesystem::directory_iterator i(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number)); i != boost::filesystem::directory_iterator(); ++i) { - boost::filesystem::copy_file (i->path(), dcp::String::compose("build/test/verify_test%1", verify_test_number) / i->path().filename()); + prepare_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number)); + for (auto i: boost::filesystem::directory_iterator(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number))) { + boost::filesystem::copy_file (i.path(), dcp::String::compose("build/test/verify_test%1", verify_test_number) / i.path().filename()); } - vector directories; - directories.push_back (dcp::String::compose("build/test/verify_test%1", verify_test_number)); - return directories; + return { dcp::String::compose("build/test/verify_test%1", verify_test_number) }; + +} + +static +void +write_dcp_with_single_asset (boost::filesystem::path dir, shared_ptr reel_asset, dcp::Standard standard = dcp::SMPTE) +{ + auto reel = make_shared(); + reel->add (reel_asset); + auto cpl = make_shared("hello", dcp::FEATURE); + cpl->add (reel); + auto dcp = make_shared(dir); + dcp->add (cpl); + dcp->write_xml (standard); } @@ -105,7 +130,7 @@ public: ~Editor () { - FILE* f = fopen(_path.string().c_str(), "w"); + auto f = fopen(_path.string().c_str(), "w"); BOOST_REQUIRE (f); fwrite (_content.c_str(), _content.length(), 1, f); fclose (f); @@ -122,29 +147,70 @@ private: }; -#if 0 static void -dump_notes (list const & notes) +dump_notes (vector const & notes) { - BOOST_FOREACH (dcp::VerificationNote i, notes) { + for (auto i: notes) { std::cout << dcp::note_to_string(i) << "\n"; } } -#endif + + +static +void +check_verify_result (vector dir, vector> types_and_codes) +{ + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + dump_notes (notes); + BOOST_REQUIRE_EQUAL (notes.size(), types_and_codes.size()); + auto i = notes.begin(); + auto j = types_and_codes.begin(); + while (i != notes.end()) { + BOOST_CHECK_EQUAL (i->type(), j->first); + BOOST_CHECK_EQUAL (i->code(), j->second); + ++i; + ++j; + } +} + + +static +void +check_verify_result_after_replace (int n, boost::function file, string from, string to, vector codes) +{ + auto directories = setup (1, n); + + { + Editor e (file(n)); + e.replace (from, to); + } + + auto notes = dcp::verify (directories, &stage, &progress, xsd_test); + + BOOST_REQUIRE_EQUAL (notes.size(), codes.size()); + auto i = notes.begin(); + auto j = codes.begin(); + while (i != notes.end()) { + BOOST_CHECK_EQUAL (i->code(), *j); + ++i; + ++j; + } +} + /* Check DCP as-is (should be OK) */ BOOST_AUTO_TEST_CASE (verify_test1) { stages.clear (); - vector directories = setup (1, 1); - list notes = dcp::verify (directories, &stage, &progress, xsd_test); + auto directories = setup (1, 1); + auto notes = dcp::verify (directories, &stage, &progress, xsd_test); boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml"; boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml"; boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml"; - list > >::const_iterator st = stages.begin(); + auto st = stages.begin(); BOOST_CHECK_EQUAL (st->first, "Checking DCP"); BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1")); @@ -168,6 +234,10 @@ BOOST_AUTO_TEST_CASE (verify_test1) BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf")); ++st; + BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata"); + BOOST_REQUIRE (st->second); + BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf")); + ++st; BOOST_CHECK_EQUAL (st->first, "Checking PKL"); BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file)); @@ -184,9 +254,9 @@ BOOST_AUTO_TEST_CASE (verify_test1) /* Corrupt the MXFs and check that this is spotted */ BOOST_AUTO_TEST_CASE (verify_test2) { - vector directories = setup (1, 2); + auto directories = setup (1, 2); - FILE* mod = fopen("build/test/verify_test2/video.mxf", "r+b"); + auto mod = fopen("build/test/verify_test2/video.mxf", "r+b"); BOOST_REQUIRE (mod); fseek (mod, 4096, SEEK_SET); int x = 42; @@ -199,64 +269,48 @@ BOOST_AUTO_TEST_CASE (verify_test2) BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1); fclose (mod); - list notes; - { - dcp::ASDCPErrorSuspender sus; - notes = dcp::verify (directories, &stage, &progress, xsd_test); - } - - BOOST_REQUIRE_EQUAL (notes.size(), 2); - BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_HASH_INCORRECT); - BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::SOUND_HASH_INCORRECT); + dcp::ASDCPErrorSuspender sus; + check_verify_result ( + directories, + { + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PICTURE_HASH_INCORRECT }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::SOUND_HASH_INCORRECT } + }); } /* Corrupt the hashes in the PKL and check that the disagreement between CPL and PKL is spotted */ BOOST_AUTO_TEST_CASE (verify_test3) { - vector directories = setup (1, 3); + auto directories = setup (1, 3); { Editor e ("build/test/verify_test3/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml"); e.replace ("", "x"); } - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 6); - list::const_iterator i = notes.begin(); - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT); - ++i; - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE); - ++i; - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE); - ++i; - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; - BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; + check_verify_result ( + directories, + { + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::CPL_HASH_INCORRECT }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR } + }); } /* Corrupt the ContentKind in the CPL */ BOOST_AUTO_TEST_CASE (verify_test4) { - vector directories = setup (1, 4); + auto directories = setup (1, 4); { Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml"); e.replace ("", "x"); } - list notes = dcp::verify (directories, &stage, &progress, xsd_test); + auto notes = dcp::verify (directories, &stage, &progress, xsd_test); BOOST_REQUIRE_EQUAL (notes.size(), 1); BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::GENERAL_READ); @@ -284,89 +338,25 @@ asset_map (int n) return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", n); } -static -void check_after_replace (int n, boost::function file, string from, string to, dcp::VerificationNote::Code code1) -{ - vector directories = setup (1, n); - - { - Editor e (file(n)); - e.replace (from, to); - } - - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().code(), code1); -} - -static -void check_after_replace (int n, boost::function file, string from, string to, dcp::VerificationNote::Code code1, dcp::VerificationNote::Code code2) -{ - vector directories = setup (1, n); - - { - Editor e (file(n)); - e.replace (from, to); - } - - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 2); - BOOST_CHECK_EQUAL (notes.front().code(), code1); - BOOST_CHECK_EQUAL (notes.back().code(), code2); -} - -static -void check_after_replace ( - int n, boost::function file, - string from, - string to, - dcp::VerificationNote::Code code1, - dcp::VerificationNote::Code code2, - dcp::VerificationNote::Code code3 - ) -{ - vector directories = setup (1, n); - - { - Editor e (file(n)); - e.replace (from, to); - } - - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 3); - list::const_iterator i = notes.begin (); - BOOST_CHECK_EQUAL (i->code(), code1); - ++i; - BOOST_CHECK_EQUAL (i->code(), code2); - ++i; - BOOST_CHECK_EQUAL (i->code(), code3); -} /* FrameRate */ BOOST_AUTO_TEST_CASE (verify_test5) { - check_after_replace ( + check_verify_result_after_replace ( 5, &cpl, "24 1", "99 1", - dcp::VerificationNote::CPL_HASH_INCORRECT, - dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE + { dcp::VerificationNote::CPL_HASH_INCORRECT, + dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE } ); } /* Missing asset */ BOOST_AUTO_TEST_CASE (verify_test6) { - vector directories = setup (1, 6); + auto directories = setup (1, 6); boost::filesystem::remove ("build/test/verify_test6/video.mxf"); - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::MISSING_ASSET); + check_verify_result (directories, {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISSING_ASSET }}); } static @@ -379,22 +369,22 @@ assetmap (int n) /* Empty asset filename in ASSETMAP */ BOOST_AUTO_TEST_CASE (verify_test7) { - check_after_replace ( + check_verify_result_after_replace ( 7, &assetmap, "video.mxf", "", - dcp::VerificationNote::EMPTY_ASSET_PATH + { dcp::VerificationNote::EMPTY_ASSET_PATH } ); } /* Mismatched standard */ BOOST_AUTO_TEST_CASE (verify_test8) { - check_after_replace ( + check_verify_result_after_replace ( 8, &cpl, "http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#", - dcp::VerificationNote::MISMATCHED_STANDARD, - dcp::VerificationNote::XML_VALIDATION_ERROR, - dcp::VerificationNote::CPL_HASH_INCORRECT + { dcp::VerificationNote::MISMATCHED_STANDARD, + dcp::VerificationNote::XML_VALIDATION_ERROR, + dcp::VerificationNote::CPL_HASH_INCORRECT } ); } @@ -402,41 +392,41 @@ BOOST_AUTO_TEST_CASE (verify_test8) BOOST_AUTO_TEST_CASE (verify_test9) { /* There's no CPL_HASH_INCORRECT error here because it can't find the correct hash by ID (since the ID is wrong) */ - check_after_replace ( + check_verify_result_after_replace ( 9, &cpl, "urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375", - dcp::VerificationNote::XML_VALIDATION_ERROR + { dcp::VerificationNote::XML_VALIDATION_ERROR } ); } /* Badly formatted in CPL */ BOOST_AUTO_TEST_CASE (verify_test10) { - check_after_replace ( + check_verify_result_after_replace ( 10, &cpl, "", "x", - dcp::VerificationNote::XML_VALIDATION_ERROR, - dcp::VerificationNote::CPL_HASH_INCORRECT + { dcp::VerificationNote::XML_VALIDATION_ERROR, + dcp::VerificationNote::CPL_HASH_INCORRECT } ); } /* Badly-formatted in PKL */ BOOST_AUTO_TEST_CASE (verify_test11) { - check_after_replace ( + check_verify_result_after_replace ( 11, &pkl, "urn:uuid:cd4", "urn:uuid:xd4", - dcp::VerificationNote::XML_VALIDATION_ERROR + { dcp::VerificationNote::XML_VALIDATION_ERROR } ); } /* Badly-formatted in ASSETMAP */ BOOST_AUTO_TEST_CASE (verify_test12) { - check_after_replace ( + check_verify_result_after_replace ( 12, &asset_map, "urn:uuid:63c", "urn:uuid:x3c", - dcp::VerificationNote::XML_VALIDATION_ERROR + { dcp::VerificationNote::XML_VALIDATION_ERROR } ); } @@ -444,14 +434,14 @@ BOOST_AUTO_TEST_CASE (verify_test12) BOOST_AUTO_TEST_CASE (verify_test13) { stages.clear (); - vector directories = setup (3, 13); - list notes = dcp::verify (directories, &stage, &progress, xsd_test); + auto directories = setup (3, 13); + auto notes = dcp::verify (directories, &stage, &progress, xsd_test); boost::filesystem::path const cpl_file = "build/test/verify_test13/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml"; boost::filesystem::path const pkl_file = "build/test/verify_test13/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml"; boost::filesystem::path const assetmap_file = "build/test/verify_test13/ASSETMAP"; - list > >::const_iterator st = stages.begin(); + auto st = stages.begin(); BOOST_CHECK_EQUAL (st->first, "Checking DCP"); BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13")); @@ -475,6 +465,10 @@ BOOST_AUTO_TEST_CASE (verify_test13) BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf")); ++st; + BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata"); + BOOST_REQUIRE (st->second); + BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf")); + ++st; BOOST_CHECK_EQUAL (st->first, "Checking PKL"); BOOST_REQUIRE (st->second); BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file)); @@ -485,25 +479,25 @@ BOOST_AUTO_TEST_CASE (verify_test13) ++st; BOOST_REQUIRE (st == stages.end()); - BOOST_CHECK_EQUAL (notes.size(), 0); + BOOST_REQUIRE_EQUAL (notes.size(), 1U); + auto i = notes.begin (); + BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR); + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE); } /* DCP with a short asset */ BOOST_AUTO_TEST_CASE (verify_test14) { - vector directories = setup (8, 14); - list notes = dcp::verify (directories, &stage, &progress, xsd_test); - - BOOST_REQUIRE_EQUAL (notes.size(), 4); - list::const_iterator i = notes.begin (); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL); - ++i; + auto directories = setup (8, 14); + check_verify_result ( + directories, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::NOT_SMPTE }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::DURATION_TOO_SMALL }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::DURATION_TOO_SMALL }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL } + }); } @@ -511,22 +505,16 @@ static void dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir) { - shared_ptr asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE)); + auto asset = make_shared(dcp::Fraction(24, 1), dcp::SMPTE); boost::filesystem::create_directories (dir); - shared_ptr writer = asset->start_write (dir / "pic.mxf", true); + auto writer = asset->start_write (dir / "pic.mxf", true); for (int i = 0; i < 24; ++i) { writer->write (frame.data(), frame.size()); } writer->finalize (); - shared_ptr reel_asset(new dcp::ReelMonoPictureAsset(asset, 0)); - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - shared_ptr dcp(new dcp::DCP(dir)); - dcp->add (cpl); - dcp->write_xml (dcp::SMPTE); + auto reel_asset = make_shared(asset, 0); + write_dcp_with_single_asset (dir, reel_asset); } @@ -536,8 +524,8 @@ BOOST_AUTO_TEST_CASE (verify_test15) int const too_big = 1302083 * 2; /* Compress a black image */ - shared_ptr image = black_image (); - dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false); + auto image = black_image (); + auto frame = dcp::compress_j2k (image, 100000000, 24, false, false); BOOST_REQUIRE (frame.size() < too_big); /* Place it in a bigger block with some zero padding at the end */ @@ -549,11 +537,10 @@ BOOST_AUTO_TEST_CASE (verify_test15) boost::filesystem::remove_all (dir); dcp_from_frame (oversized_frame, dir); - vector dirs; - dirs.push_back (dir); - list 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); + check_verify_result ( + { dir }, + {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES }} + ); } @@ -563,8 +550,8 @@ BOOST_AUTO_TEST_CASE (verify_test16) int const nearly_too_big = 1302083 * 0.98; /* Compress a black image */ - shared_ptr image = black_image (); - dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false); + auto image = black_image (); + auto frame = dcp::compress_j2k (image, 100000000, 24, false, false); BOOST_REQUIRE (frame.size() < nearly_too_big); /* Place it in a bigger block with some zero padding at the end */ @@ -576,11 +563,10 @@ BOOST_AUTO_TEST_CASE (verify_test16) boost::filesystem::remove_all (dir); dcp_from_frame (oversized_frame, dir); - vector dirs; - dirs.push_back (dir); - list 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); + check_verify_result ( + { dir }, + {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES }} + ); } @@ -588,17 +574,15 @@ BOOST_AUTO_TEST_CASE (verify_test16) BOOST_AUTO_TEST_CASE (verify_test17) { /* Compress a black image */ - shared_ptr image = black_image (); - dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false); + auto image = black_image (); + auto frame = dcp::compress_j2k (image, 100000000, 24, false, false); BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8)); boost::filesystem::path const dir("build/test/verify_test17"); boost::filesystem::remove_all (dir); dcp_from_frame (frame, dir); - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); BOOST_REQUIRE_EQUAL (notes.size(), 0); } @@ -607,23 +591,13 @@ BOOST_AUTO_TEST_CASE (verify_test17) BOOST_AUTO_TEST_CASE (verify_test18) { boost::filesystem::path const dir("build/test/verify_test18"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml"); - shared_ptr asset(new dcp::InteropSubtitleAsset(dir / "subs.xml")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - shared_ptr dcp(new dcp::DCP(dir)); - dcp->add (cpl); - dcp->write_xml (dcp::INTEROP); + auto asset = make_shared(dir / "subs.xml"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset, dcp::INTEROP); - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 0); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::NOT_SMPTE }}); } @@ -631,30 +605,24 @@ BOOST_AUTO_TEST_CASE (verify_test18) BOOST_AUTO_TEST_CASE (verify_test19) { boost::filesystem::path const dir("build/test/verify_test19"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml"); - shared_ptr asset(new dcp::InteropSubtitleAsset(dir / "subs.xml")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - shared_ptr dcp(new dcp::DCP(dir)); - dcp->add (cpl); - dcp->write_xml (dcp::INTEROP); + auto asset = make_shared(dir / "subs.xml"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset, dcp::INTEROP); { Editor e (dir / "subs.xml"); e.replace ("", ""); } - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 2); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR); + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::NOT_SMPTE }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR } + }); } @@ -662,22 +630,13 @@ BOOST_AUTO_TEST_CASE (verify_test19) BOOST_AUTO_TEST_CASE (verify_test20) { boost::filesystem::path const dir("build/test/verify_test20"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); - shared_ptr asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - shared_ptr dcp(new dcp::DCP(dir)); - dcp->add (cpl); - dcp->write_xml (dcp::SMPTE); + auto asset = make_shared(dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset); - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); BOOST_REQUIRE_EQUAL (notes.size(), 0); } @@ -686,25 +645,19 @@ BOOST_AUTO_TEST_CASE (verify_test20) BOOST_AUTO_TEST_CASE (verify_test21) { boost::filesystem::path const dir("build/test/verify_test21"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); boost::filesystem::copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf"); - shared_ptr asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - shared_ptr dcp(new dcp::DCP(dir)); - dcp->add (cpl); - dcp->write_xml (dcp::SMPTE); - - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 2); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR); + auto asset = make_shared(dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME } + }); } @@ -712,11 +665,10 @@ BOOST_AUTO_TEST_CASE (verify_test21) BOOST_AUTO_TEST_CASE (verify_test22) { boost::filesystem::path const ov_dir("build/test/verify_test22_ov"); - boost::filesystem::remove_all (ov_dir); - boost::filesystem::create_directories (ov_dir); + prepare_directory (ov_dir); - shared_ptr image = black_image (); - dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false); + auto image = black_image (); + auto frame = dcp::compress_j2k (image, 100000000, 24, false, false); BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8)); dcp_from_frame (frame, ov_dir); @@ -724,22 +676,13 @@ BOOST_AUTO_TEST_CASE (verify_test22) ov.read (); boost::filesystem::path const vf_dir("build/test/verify_test22_vf"); - boost::filesystem::remove_all (vf_dir); - boost::filesystem::create_directories (vf_dir); + prepare_directory (vf_dir); - shared_ptr reel(new dcp::Reel()); - reel->add (ov.cpls().front()->reels().front()->main_picture()); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); - cpl->add (reel); - dcp::DCP vf (vf_dir); - vf.add (cpl); - vf.write_xml (dcp::SMPTE); + write_dcp_with_single_asset (vf_dir, ov.cpls().front()->reels().front()->main_picture()); - vector dirs; - dirs.push_back (vf_dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::EXTERNAL_ASSET); + check_verify_result ( + { vf_dir }, + {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::EXTERNAL_ASSET }}); } @@ -747,16 +690,15 @@ BOOST_AUTO_TEST_CASE (verify_test22) BOOST_AUTO_TEST_CASE (verify_test23) { boost::filesystem::path const dir("build/test/verify_test23"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); - shared_ptr asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); + auto asset = make_shared(dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); - shared_ptr reel(new dcp::Reel()); + auto reel = make_shared(); reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); + auto cpl = make_shared("hello", dcp::FEATURE); cpl->add (reel); cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); cpl->set_main_sound_sample_rate (48000); @@ -767,22 +709,21 @@ BOOST_AUTO_TEST_CASE (verify_test23) dcp.add (cpl); dcp.write_xml (dcp::SMPTE); - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_CHECK (notes.empty()); } boost::filesystem::path find_cpl (boost::filesystem::path dir) { - for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); i++) { - if (boost::starts_with(i->path().filename().string(), "cpl_")) { - return i->path(); + for (auto i: boost::filesystem::directory_iterator(dir)) { + if (boost::starts_with(i.path().filename().string(), "cpl_")) { + return i.path(); } } BOOST_REQUIRE (false); - return boost::filesystem::path(); + return {}; } @@ -790,12 +731,11 @@ boost::filesystem::path find_cpl (boost::filesystem::path dir) BOOST_AUTO_TEST_CASE (verify_test24) { boost::filesystem::path const dir("build/test/verify_test24"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); - shared_ptr reel(new dcp::Reel()); + auto reel = make_shared(); reel->add (black_picture_asset(dir)); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); + auto cpl = make_shared("hello", dcp::FEATURE); cpl->add (reel); cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); cpl->set_main_sound_sample_rate (48000); @@ -811,20 +751,14 @@ BOOST_AUTO_TEST_CASE (verify_test24) e.replace ("MainSound", "MainSoundX"); } - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 4); - - list::const_iterator i = notes.begin (); - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR); - ++i; - BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT); - ++i; + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::XML_VALIDATION_ERROR }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::CPL_HASH_INCORRECT } + }); } @@ -832,16 +766,11 @@ BOOST_AUTO_TEST_CASE (verify_test24) BOOST_AUTO_TEST_CASE (verify_test25) { boost::filesystem::path const dir("build/test/verify_test25"); - boost::filesystem::remove_all (dir); - boost::filesystem::create_directories (dir); + prepare_directory (dir); - boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); - shared_ptr asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf")); - shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); - - shared_ptr reel(new dcp::Reel()); - reel->add (reel_asset); - shared_ptr cpl(new dcp::CPL("hello", dcp::FEATURE)); + auto reel = make_shared(); + reel->add (black_picture_asset(dir)); + auto cpl = make_shared("hello", dcp::FEATURE); cpl->add (reel); cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); cpl->set_main_sound_sample_rate (48000); @@ -854,11 +783,871 @@ BOOST_AUTO_TEST_CASE (verify_test25) { Editor e (find_cpl("build/test/verify_test25")); - e.replace ("", ""); + e.replace ("meta:Width", "meta:WidthX"); + } + + check_verify_result ( + { dir }, + {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::GENERAL_READ }} + ); +} + + +/* SMPTE DCP with invalid in the MainSubtitle reel and also in the XML within the MXF */ +BOOST_AUTO_TEST_CASE (verify_test26) +{ + boost::filesystem::path const dir("build/test/verify_test26"); + prepare_directory (dir); + boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); + auto asset = make_shared(dir / "subs.mxf"); + asset->_language = "wrong-andbad"; + asset->write (dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + reel_asset->_language = "badlang"; + write_dcp_with_single_asset (dir, reel_asset); + + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE_EQUAL (notes.size(), 2U); + auto i = notes.begin(); + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "badlang"); + i++; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad"); +} + + +/* SMPTE DCP with invalid in the MainClosedCaption reel and also in the XML within the MXF */ +BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_languages) +{ + boost::filesystem::path const dir("build/test/verify_invalid_closed_caption_languages"); + prepare_directory (dir); + boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); + auto asset = make_shared(dir / "subs.mxf"); + asset->_language = "wrong-andbad"; + asset->write (dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + reel_asset->_language = "badlang"; + write_dcp_with_single_asset (dir, reel_asset); + + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE_EQUAL (notes.size(), 2U); + auto i = notes.begin (); + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "badlang"); + i++; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad"); +} + + +/* SMPTE DCP with invalid in the MainSound reel, the CPL additional subtitles languages and + * the release territory. + */ +BOOST_AUTO_TEST_CASE (verify_various_invalid_languages) +{ + boost::filesystem::path const dir("build/test/verify_various_invalid_languages"); + prepare_directory (dir); + + auto picture = simple_picture (dir, "foo"); + auto reel_picture = make_shared(picture, 0); + auto reel = make_shared(); + reel->add (reel_picture); + auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz"); + auto reel_sound = make_shared(sound, 0); + reel->add (reel_sound); + auto cpl = make_shared("hello", dcp::FEATURE); + cpl->add (reel); + cpl->_additional_subtitle_languages.push_back("this-is-wrong"); + cpl->_additional_subtitle_languages.push_back("andso-is-this"); + cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_sample_rate (48000); + cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); + cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); + cpl->_release_territory = "fred-jim"; + auto dcp = make_shared(dir); + dcp->add (cpl); + dcp->write_xml (dcp::SMPTE); + + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE_EQUAL (notes.size(), 4U); + auto i = notes.begin (); + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "this-is-wrong"); + ++i; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "andso-is-this"); + ++i; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "fred-jim"); + ++i; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "frobozz"); + ++i; +} + + +static +vector +check_picture_size (int width, int height, int frame_rate, bool three_d) +{ + using namespace boost::filesystem; + + path dcp_path = "build/test/verify_picture_test"; + remove_all (dcp_path); + create_directories (dcp_path); + + shared_ptr mp; + if (three_d) { + mp = make_shared(dcp::Fraction(frame_rate, 1), dcp::SMPTE); + } else { + mp = make_shared(dcp::Fraction(frame_rate, 1), dcp::SMPTE); + } + auto picture_writer = mp->start_write (dcp_path / "video.mxf", false); + + auto image = black_image (dcp::Size(width, height)); + auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048); + int const length = three_d ? frame_rate * 2 : frame_rate; + for (int i = 0; i < length; ++i) { + picture_writer->write (j2c.data(), j2c.size()); + } + picture_writer->finalize (); + + auto d = make_shared(dcp_path); + auto cpl = make_shared("A Test DCP", dcp::FEATURE); + cpl->set_annotation_text ("A Test DCP"); + cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); + + auto reel = make_shared(); + + if (three_d) { + reel->add (make_shared(std::dynamic_pointer_cast(mp), 0)); + } else { + reel->add (make_shared(std::dynamic_pointer_cast(mp), 0)); + } + + cpl->add (reel); + + d->add (cpl); + d->write_xml (dcp::SMPTE); + + return dcp::verify ({dcp_path}, &stage, &progress, xsd_test); +} + + +static +void +check_picture_size_ok (int width, int height, int frame_rate, bool three_d) +{ + auto notes = check_picture_size(width, height, frame_rate, three_d); + dump_notes (notes); + BOOST_CHECK_EQUAL (notes.size(), 0U); +} + + +static +void +check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool three_d) +{ + auto notes = check_picture_size(width, height, frame_rate, three_d); + BOOST_REQUIRE_EQUAL (notes.size(), 1U); + BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_SIZE_IN_PIXELS); +} + + +static +void +check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, bool three_d) +{ + auto notes = check_picture_size(width, height, frame_rate, three_d); + BOOST_REQUIRE_EQUAL (notes.size(), 2U); + BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_BV21_ERROR); + BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_2K); +} + + +static +void +check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, bool three_d) +{ + auto notes = check_picture_size(width, height, frame_rate, three_d); + BOOST_REQUIRE_EQUAL (notes.size(), 1U); + BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_4K); +} + + +BOOST_AUTO_TEST_CASE (verify_picture_size) +{ + using namespace boost::filesystem; + + /* 2K scope */ + check_picture_size_ok (2048, 858, 24, false); + check_picture_size_ok (2048, 858, 25, false); + check_picture_size_ok (2048, 858, 48, false); + check_picture_size_ok (2048, 858, 24, true); + check_picture_size_ok (2048, 858, 25, true); + check_picture_size_ok (2048, 858, 48, true); + + /* 2K flat */ + check_picture_size_ok (1998, 1080, 24, false); + check_picture_size_ok (1998, 1080, 25, false); + check_picture_size_ok (1998, 1080, 48, false); + check_picture_size_ok (1998, 1080, 24, true); + check_picture_size_ok (1998, 1080, 25, true); + check_picture_size_ok (1998, 1080, 48, true); + + /* 4K scope */ + check_picture_size_ok (4096, 1716, 24, false); + + /* 4K flat */ + check_picture_size_ok (3996, 2160, 24, false); + + /* Bad frame size */ + check_picture_size_bad_frame_size (2050, 858, 24, false); + check_picture_size_bad_frame_size (2048, 658, 25, false); + check_picture_size_bad_frame_size (1920, 1080, 48, true); + check_picture_size_bad_frame_size (4000, 3000, 24, true); + + /* Bad 2K frame rate */ + check_picture_size_bad_2k_frame_rate (2048, 858, 26, false); + check_picture_size_bad_2k_frame_rate (2048, 858, 31, false); + check_picture_size_bad_2k_frame_rate (1998, 1080, 50, true); + + /* Bad 4K frame rate */ + check_picture_size_bad_4k_frame_rate (3996, 2160, 25, false); + check_picture_size_bad_4k_frame_rate (3996, 2160, 48, false); + + /* No 4K 3D */ + auto notes = check_picture_size(3996, 2160, 24, true); + BOOST_REQUIRE_EQUAL (notes.size(), 1U); + BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_4K_3D); +} + + +static +void +add_test_subtitle (shared_ptr asset, int start_frame, int end_frame, float v_position = 0, string text = "Hello") +{ + asset->add ( + make_shared( + optional(), + false, + false, + false, + dcp::Colour(), + 42, + 1, + dcp::Time(start_frame, 24, 24), + dcp::Time(end_frame, 24, 24), + 0, + dcp::HALIGN_CENTER, + v_position, + dcp::VALIGN_CENTER, + dcp::DIRECTION_LTR, + text, + dcp::NONE, + dcp::Colour(), + dcp::Time(), + dcp::Time() + ) + ); +} + + +BOOST_AUTO_TEST_CASE (verify_closed_caption_xml_too_large) +{ + boost::filesystem::path const dir("build/test/verify_closed_caption_xml_too_large"); + prepare_directory (dir); + + auto asset = make_shared(); + for (int i = 0; i < 2048; ++i) { + add_test_subtitle (asset, i * 24, i * 24 + 20); + } + asset->set_language (dcp::LanguageTag("de-DE")); + asset->write (dir / "subs.mxf"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES }, + { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY } + }); +} + + +static +shared_ptr +make_large_subtitle_asset (boost::filesystem::path font_file) +{ + auto asset = make_shared(); + dcp::ArrayData big_fake_font(1024 * 1024); + big_fake_font.write (font_file); + for (int i = 0; i < 116; ++i) { + asset->add_font (dcp::String::compose("big%1", i), big_fake_font); + } + return asset; +} + + +template +void +verify_timed_text_asset_too_large (string name) +{ + auto const dir = boost::filesystem::path("build/test") / name; + prepare_directory (dir); + auto asset = make_large_subtitle_asset (dir / "font.ttf"); + add_test_subtitle (asset, 0, 20); + asset->set_language (dcp::LanguageTag("de-DE")); + asset->write (dir / "subs.mxf"); + + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TIMED_TEXT_ASSET_TOO_LARGE_IN_BYTES }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TIMED_TEXT_FONTS_TOO_LARGE_IN_BYTES }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME }, + { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY } + }); +} + + +BOOST_AUTO_TEST_CASE (verify_subtitle_asset_too_large) +{ + verify_timed_text_asset_too_large("verify_subtitle_asset_too_large"); + verify_timed_text_asset_too_large("verify_closed_caption_asset_too_large"); +} + + +BOOST_AUTO_TEST_CASE (verify_missing_language_tag_in_subtitle_xml) +{ + boost::filesystem::path dir = "build/test/verify_missing_language_tag_in_subtitle_xml"; + prepare_directory (dir); + auto dcp = make_simple (dir, 1); + + string const xml = + "" + "" + "urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a" + "Content" + "Annotation" + "2018-10-02T12:25:14+02:00" + "1" + "25 1" + "25" + "00:00:00:00" + "urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6" + "" + "" + "" + "Hello world" + "" + "" + "" + ""; + + auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w"); + BOOST_REQUIRE (xml_file); + fwrite (xml.c_str(), xml.size(), 1, xml_file); + fclose (xml_file); + auto subs = make_shared(dir / "subs.xml"); + subs->write (dir / "subs.mxf"); + + auto reel_subs = make_shared(subs, dcp::Fraction(24, 1), 100, 0); + dcp->cpls().front()->reels().front()->add(reel_subs); + dcp->write_xml (dcp::SMPTE); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_LANGUAGE }, + { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY } + }); +} + + +BOOST_AUTO_TEST_CASE (verify_inconsistent_subtitle_languages) +{ + boost::filesystem::path path ("build/test/verify_inconsistent_subtitle_languages"); + auto dcp = make_simple (path, 2, 240); + auto cpl = dcp->cpls()[0]; + + { + auto subs = make_shared(); + subs->set_language (dcp::LanguageTag("de-DE")); + subs->add (simple_subtitle()); + subs->write (path / "subs1.mxf"); + auto reel_subs = make_shared(subs, dcp::Fraction(24, 1), 240, 0); + cpl->reels()[0]->add(reel_subs); + } + + { + auto subs = make_shared(); + subs->set_language (dcp::LanguageTag("en-US")); + subs->add (simple_subtitle()); + subs->write (path / "subs2.mxf"); + auto reel_subs = make_shared(subs, dcp::Fraction(24, 1), 240, 0); + cpl->reels()[1]->add(reel_subs); + } + + dcp->write_xml (dcp::SMPTE); + + check_verify_result ( + { path }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::SUBTITLE_LANGUAGES_DIFFER }, + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME } + }); +} + + +BOOST_AUTO_TEST_CASE (verify_missing_start_time_tag_in_subtitle_xml) +{ + boost::filesystem::path dir = "build/test/verify_missing_start_time_tag_in_subtitle_xml"; + prepare_directory (dir); + auto dcp = make_simple (dir, 1); + + string const xml = + "" + "" + "urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a" + "Content" + "Annotation" + "2018-10-02T12:25:14+02:00" + "1" + "de-DE" + "25 1" + "25" + "urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6" + "" + "" + "" + "Hello world" + "" + "" + "" + ""; + + auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w"); + BOOST_REQUIRE (xml_file); + fwrite (xml.c_str(), xml.size(), 1, xml_file); + fclose (xml_file); + auto subs = make_shared(dir / "subs.xml"); + subs->write (dir / "subs.mxf"); + + auto reel_subs = make_shared(subs, dcp::Fraction(24, 1), 100, 0); + dcp->cpls().front()->reels().front()->add(reel_subs); + dcp->write_xml (dcp::SMPTE); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME }, + { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY } + }); +} + + +BOOST_AUTO_TEST_CASE (verify_non_zero_start_time_tag_in_subtitle_xml) +{ + boost::filesystem::path dir = "build/test/verify_non_zero_start_time_tag_in_subtitle_xml"; + prepare_directory (dir); + auto dcp = make_simple (dir, 1); + + string const xml = + "" + "" + "urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a" + "Content" + "Annotation" + "2018-10-02T12:25:14+02:00" + "1" + "de-DE" + "25 1" + "25" + "00:00:02:00" + "urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6" + "" + "" + "" + "Hello world" + "" + "" + "" + ""; + + auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w"); + BOOST_REQUIRE (xml_file); + fwrite (xml.c_str(), xml.size(), 1, xml_file); + fclose (xml_file); + auto subs = make_shared(dir / "subs.xml"); + subs->write (dir / "subs.mxf"); + + auto reel_subs = make_shared(subs, dcp::Fraction(24, 1), 100, 0); + dcp->cpls().front()->reels().front()->add(reel_subs); + dcp->write_xml (dcp::SMPTE); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::SUBTITLE_START_TIME_NON_ZERO }, + { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY } + }); +} + + +class TestText +{ +public: + TestText (int in_, int out_, float v_position_ = 0, string text_ = "Hello") + : in(in_) + , out(out_) + , v_position(v_position_) + , text(text_) + {} + + int in; + int out; + float v_position; + string text; +}; + + +template +void +dcp_with_text (boost::filesystem::path dir, vector subs) +{ + prepare_directory (dir); + auto asset = make_shared(); + asset->set_start_time (dcp::Time()); + for (auto i: subs) { + add_test_subtitle (asset, i.in, i.out, i.v_position, i.text); + } + asset->set_language (dcp::LanguageTag("de-DE")); + asset->write (dir / "subs.mxf"); + + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset (dir, reel_asset); +} + + +BOOST_AUTO_TEST_CASE (verify_text_too_early) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_too_early"); + /* Just too early */ + dcp_with_text (dir, {{ 4 * 24 - 1, 5 * 24 }}); + check_verify_result ( + { dir }, + {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY }}); +} + + +BOOST_AUTO_TEST_CASE (verify_text_not_too_early) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_not_too_early"); + /* Just late enough */ + dcp_with_text (dir, {{ 4 * 24, 5 * 24 }}); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_text_early_on_second_reel) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_early_on_second_reel"); + prepare_directory (dir); + + auto asset1 = make_shared(); + asset1->set_start_time (dcp::Time()); + /* Just late enough */ + add_test_subtitle (asset1, 4 * 24, 5 * 24); + asset1->set_language (dcp::LanguageTag("de-DE")); + asset1->write (dir / "subs1.mxf"); + auto reel_asset1 = make_shared(asset1, dcp::Fraction(24, 1), 16 * 24, 0); + auto reel1 = make_shared(); + reel1->add (reel_asset1); + + auto asset2 = make_shared(); + asset2->set_start_time (dcp::Time()); + /* This would be too early on first reel but should be OK on the second */ + add_test_subtitle (asset2, 0, 4 * 24); + asset2->set_language (dcp::LanguageTag("de-DE")); + asset2->write (dir / "subs2.mxf"); + auto reel_asset2 = make_shared(asset2, dcp::Fraction(24, 1), 16 * 24, 0); + auto reel2 = make_shared(); + reel2->add (reel_asset2); + + auto cpl = make_shared("hello", dcp::FEATURE); + cpl->add (reel1); + cpl->add (reel2); + auto dcp = make_shared(dir); + dcp->add (cpl); + dcp->write_xml (dcp::SMPTE); + + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_text_too_close) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_too_close"); + dcp_with_text ( + dir, + { + { 4 * 24, 5 * 24 }, + { 5 * 24 + 1, 6 * 24 }, + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_CLOSE }}); +} + + +BOOST_AUTO_TEST_CASE (verify_text_not_too_close) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_not_too_close"); + dcp_with_text ( + dir, + { + { 4 * 24, 5 * 24 }, + { 5 * 24 + 16, 8 * 24 }, + }); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_text_too_short) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_too_short"); + dcp_with_text (dir, {{ 4 * 24, 4 * 24 + 1 }}); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_SHORT }}); +} + + +BOOST_AUTO_TEST_CASE (verify_text_not_too_short) +{ + auto const dir = boost::filesystem::path("build/test/verify_text_not_too_short"); + dcp_with_text (dir, {{ 4 * 24, 4 * 24 + 17 }}); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_too_many_subtitle_lines1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_too_many_subtitle_lines1"); + dcp_with_text ( + dir, + { + { 96, 200, 0.0, "We" }, + { 96, 200, 0.1, "have" }, + { 96, 200, 0.2, "four" }, + { 96, 200, 0.3, "lines" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES}}); +} + + +BOOST_AUTO_TEST_CASE (verify_not_too_many_subtitle_lines1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_not_too_many_subtitle_lines1"); + dcp_with_text ( + dir, + { + { 96, 200, 0.0, "We" }, + { 96, 200, 0.1, "have" }, + { 96, 200, 0.2, "four" }, + }); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_too_many_subtitle_lines2) +{ + auto const dir = boost::filesystem::path ("build/test/verify_too_many_subtitle_lines2"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "We" }, + { 96, 300, 0.1, "have" }, + { 150, 180, 0.2, "four" }, + { 150, 180, 0.3, "lines" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES}}); +} + + +BOOST_AUTO_TEST_CASE (verify_not_too_many_subtitle_lines2) +{ + auto const dir = boost::filesystem::path ("build/test/verify_not_too_many_subtitle_lines2"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "We" }, + { 96, 300, 0.1, "have" }, + { 150, 180, 0.2, "four" }, + { 190, 250, 0.3, "lines" } + }); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_subtitle_lines_too_long1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_subtitle_lines_too_long1"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_LONGER_THAN_RECOMMENDED }}); +} + + +BOOST_AUTO_TEST_CASE (verify_subtitle_lines_too_long2) +{ + auto const dir = boost::filesystem::path ("build/test/verify_subtitle_lines_too_long2"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_TOO_LONG }}); +} + + +BOOST_AUTO_TEST_CASE (verify_too_many_closed_caption_lines1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_too_many_closed_caption_lines1"); + dcp_with_text ( + dir, + { + { 96, 200, 0.0, "We" }, + { 96, 200, 0.1, "have" }, + { 96, 200, 0.2, "four" }, + { 96, 200, 0.3, "lines" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TOO_MANY_CLOSED_CAPTION_LINES}}); +} + + +BOOST_AUTO_TEST_CASE (verify_not_too_many_closed_caption_lines1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_not_too_many_closed_caption_lines1"); + dcp_with_text ( + dir, + { + { 96, 200, 0.0, "We" }, + { 96, 200, 0.1, "have" }, + { 96, 200, 0.2, "four" }, + }); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_too_many_closed_caption_lines2) +{ + auto const dir = boost::filesystem::path ("build/test/verify_too_many_closed_caption_lines2"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "We" }, + { 96, 300, 0.1, "have" }, + { 150, 180, 0.2, "four" }, + { 150, 180, 0.3, "lines" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TOO_MANY_CLOSED_CAPTION_LINES}}); +} + + +BOOST_AUTO_TEST_CASE (verify_not_too_many_closed_caption_lines2) +{ + auto const dir = boost::filesystem::path ("build/test/verify_not_too_many_closed_caption_lines2"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "We" }, + { 96, 300, 0.1, "have" }, + { 150, 180, 0.2, "four" }, + { 190, 250, 0.3, "lines" } + }); + auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test); + BOOST_REQUIRE (notes.empty()); +} + + +BOOST_AUTO_TEST_CASE (verify_closed_caption_lines_too_long1) +{ + auto const dir = boost::filesystem::path ("build/test/verify_closed_caption_lines_too_long1"); + dcp_with_text ( + dir, + { + { 96, 300, 0.0, "0123456789012345678901234567890123" } + }); + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_LINE_TOO_LONG }}); +} + + +BOOST_AUTO_TEST_CASE (verify_sound_sampling_rate_must_be_48k) +{ + boost::filesystem::path const dir("build/test/verify_sound_sampling_rate_must_be_48k"); + prepare_directory (dir); + + auto picture = simple_picture (dir, "foo"); + auto reel_picture = make_shared(picture, 0); + auto reel = make_shared(); + reel->add (reel_picture); + auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "de-DE", 24, 96000); + auto reel_sound = make_shared(sound, 0); + reel->add (reel_sound); + auto cpl = make_shared("hello", dcp::FEATURE); + cpl->add (reel); + auto dcp = make_shared(dir); + dcp->add (cpl); + dcp->write_xml (dcp::SMPTE); + + check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_SOUND_FRAME_RATE }}); +} + + +BOOST_AUTO_TEST_CASE (verify_cpl_must_have_annotation_text) +{ + boost::filesystem::path const dir("build/test/verify_cpl_must_have_annotation_text"); + auto dcp = make_simple (dir); + dcp->write_xml (dcp::SMPTE); + BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U); + + { + BOOST_REQUIRE (dcp->cpls()[0]->file()); + Editor e(dcp->cpls()[0]->file().get()); + e.replace("A Test DCP", ""); } - vector dirs; - dirs.push_back (dir); - list notes = dcp::verify (dirs, &stage, &progress, xsd_test); + check_verify_result ( + {dir}, + { + { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_ANNOTATION_TEXT_IN_CPL }, + { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::CPL_HASH_INCORRECT } + }); }