/*
- Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
setup (int reference_number, int verify_test_number)
{
prepare_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());
+ 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<boost::filesystem::path> 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<dcp::ReelAsset> reel_asset, dcp::Standard standard = dcp::SMPTE)
+{
+ auto reel = make_shared<dcp::Reel>();
+ reel->add (reel_asset);
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
+ cpl->add (reel);
+ auto dcp = make_shared<dcp::DCP>(dir);
+ dcp->add (cpl);
+ dcp->write_xml (standard);
+}
+
+
/** Class that can alter a file by searching and replacing strings within it.
* On destruction modifies the file whose name was given to the constructor.
*/
~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);
void
dump_notes (list<dcp::VerificationNote> const & notes)
{
- BOOST_FOREACH (dcp::VerificationNote i, notes) {
+ for (auto i: notes) {
std::cout << dcp::note_to_string(i) << "\n";
}
}
+
+static
+void
+check_verify_result (vector<boost::filesystem::path> dir, vector<std::pair<dcp::VerificationNote::Type, dcp::VerificationNote::Code>> types_and_codes)
+{
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+ 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<boost::filesystem::path (int)> file, string from, string to, vector<dcp::VerificationNote::Code> 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<boost::filesystem::path> directories = setup (1, 1);
- list<dcp::VerificationNote> 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<pair<string, optional<boost::filesystem::path> > >::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"));
/* Corrupt the MXFs and check that this is spotted */
BOOST_AUTO_TEST_CASE (verify_test2)
{
- vector<boost::filesystem::path> 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;
BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
fclose (mod);
- list<dcp::VerificationNote> 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<boost::filesystem::path> directories = setup (1, 3);
+ auto directories = setup (1, 3);
{
Editor e ("build/test/verify_test3/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml");
e.replace ("<Hash>", "<Hash>x");
}
- list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
-
- BOOST_REQUIRE_EQUAL (notes.size(), 6);
- list<dcp::VerificationNote>::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_DIFFER);
- ++i;
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER);
- ++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<boost::filesystem::path> directories = setup (1, 4);
+ auto directories = setup (1, 4);
{
Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
e.replace ("<ContentKind>", "<ContentKind>x");
}
- list<dcp::VerificationNote> 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);
return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", n);
}
-static
-void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1)
-{
- vector<boost::filesystem::path> directories = setup (1, n);
-
- {
- Editor e (file(n));
- e.replace (from, to);
- }
-
- list<dcp::VerificationNote> 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<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1, dcp::VerificationNote::Code code2)
-{
- vector<boost::filesystem::path> directories = setup (1, n);
-
- {
- Editor e (file(n));
- e.replace (from, to);
- }
-
- list<dcp::VerificationNote> 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<boost::filesystem::path (int)> file,
- string from,
- string to,
- dcp::VerificationNote::Code code1,
- dcp::VerificationNote::Code code2,
- dcp::VerificationNote::Code code3
- )
-{
- vector<boost::filesystem::path> directories = setup (1, n);
-
- {
- Editor e (file(n));
- e.replace (from, to);
- }
-
- list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
-
- BOOST_REQUIRE_EQUAL (notes.size(), 3);
- list<dcp::VerificationNote>::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,
"<FrameRate>24 1", "<FrameRate>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<boost::filesystem::path> directories = setup (1, 6);
+ auto directories = setup (1, 6);
boost::filesystem::remove ("build/test/verify_test6/video.mxf");
- list<dcp::VerificationNote> 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
/* Empty asset filename in ASSETMAP */
BOOST_AUTO_TEST_CASE (verify_test7)
{
- check_after_replace (
+ check_verify_result_after_replace (
7, &assetmap,
"<Path>video.mxf</Path>", "<Path></Path>",
- 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 }
);
}
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,
"<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
- dcp::VerificationNote::XML_VALIDATION_ERROR
+ { dcp::VerificationNote::XML_VALIDATION_ERROR }
);
}
/* Badly formatted <IssueDate> in CPL */
BOOST_AUTO_TEST_CASE (verify_test10)
{
- check_after_replace (
+ check_verify_result_after_replace (
10, &cpl,
"<IssueDate>", "<IssueDate>x",
- dcp::VerificationNote::XML_VALIDATION_ERROR,
- dcp::VerificationNote::CPL_HASH_INCORRECT
+ { dcp::VerificationNote::XML_VALIDATION_ERROR,
+ dcp::VerificationNote::CPL_HASH_INCORRECT }
);
}
/* Badly-formatted <Id> in PKL */
BOOST_AUTO_TEST_CASE (verify_test11)
{
- check_after_replace (
+ check_verify_result_after_replace (
11, &pkl,
"<Id>urn:uuid:cd4", "<Id>urn:uuid:xd4",
- dcp::VerificationNote::XML_VALIDATION_ERROR
+ { dcp::VerificationNote::XML_VALIDATION_ERROR }
);
}
/* Badly-formatted <Id> in ASSETMAP */
BOOST_AUTO_TEST_CASE (verify_test12)
{
- check_after_replace (
+ check_verify_result_after_replace (
12, &asset_map,
"<Id>urn:uuid:63c", "<Id>urn:uuid:x3c",
- dcp::VerificationNote::XML_VALIDATION_ERROR
+ { dcp::VerificationNote::XML_VALIDATION_ERROR }
);
}
BOOST_AUTO_TEST_CASE (verify_test13)
{
stages.clear ();
- vector<boost::filesystem::path> directories = setup (3, 13);
- list<dcp::VerificationNote> 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<pair<string, optional<boost::filesystem::path> > >::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"));
BOOST_REQUIRE (st == stages.end());
BOOST_REQUIRE_EQUAL (notes.size(), 1U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ 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<boost::filesystem::path> directories = setup (8, 14);
- list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
-
- BOOST_REQUIRE_EQUAL (notes.size(), 5);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
- ++i;
- 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 }
+ });
}
void
dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir)
{
- shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
+ auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::SMPTE);
boost::filesystem::create_directories (dir);
- shared_ptr<dcp::PictureAssetWriter> 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<dcp::ReelAsset> reel_asset(new dcp::ReelMonoPictureAsset(asset, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ auto reel_asset = make_shared<dcp::ReelMonoPictureAsset>(asset, 0);
+ write_dcp_with_single_asset (dir, reel_asset);
}
int const too_big = 1302083 * 2;
/* Compress a black image */
- shared_ptr<dcp::OpenJPEGImage> 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 */
boost::filesystem::remove_all (dir);
dcp_from_frame (oversized_frame, dir);
- vector<boost::filesystem::path> dirs;
- 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_IN_BYTES);
+ check_verify_result (
+ { dir },
+ {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES }}
+ );
}
int const nearly_too_big = 1302083 * 0.98;
/* Compress a black image */
- shared_ptr<dcp::OpenJPEGImage> 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 */
boost::filesystem::remove_all (dir);
dcp_from_frame (oversized_frame, dir);
- vector<boost::filesystem::path> dirs;
- 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_IN_BYTES);
+ check_verify_result (
+ { dir },
+ {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES }}
+ );
}
BOOST_AUTO_TEST_CASE (verify_test17)
{
/* Compress a black image */
- shared_ptr<dcp::OpenJPEGImage> 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<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), 0);
}
boost::filesystem::path const dir("build/test/verify_test18");
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
- shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::INTEROP);
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset (dir, reel_asset, dcp::INTEROP);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 1U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
+ check_verify_result (
+ { dir },
+ {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::NOT_SMPTE }}
+ );
}
boost::filesystem::path const dir("build/test/verify_test19");
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
- shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::INTEROP);
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(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 ("</ReelNumber>", "</ReelNumber><Foo></Foo>");
}
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 3);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
- ++i;
+ 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 }
+ });
}
boost::filesystem::path const dir("build/test/verify_test20");
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset (dir, reel_asset);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
dump_notes (notes);
BOOST_REQUIRE_EQUAL (notes.size(), 0);
}
boost::filesystem::path const dir("build/test/verify_test21");
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
-
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 3);
- list<dcp::VerificationNote>::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::MISSING_SUBTITLE_START_TIME);
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(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 }
+ });
}
boost::filesystem::path const ov_dir("build/test/verify_test22_ov");
prepare_directory (ov_dir);
- shared_ptr<dcp::OpenJPEGImage> 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);
boost::filesystem::path const vf_dir("build/test/verify_test22_vf");
prepare_directory (vf_dir);
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (ov.cpls().front()->reels().front()->main_picture());
- shared_ptr<dcp::CPL> 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<boost::filesystem::path> dirs;
- dirs.push_back (vf_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::EXTERNAL_ASSET);
+ check_verify_result (
+ { vf_dir },
+ {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::EXTERNAL_ASSET }});
}
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ auto reel = make_shared<dcp::Reel>();
reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
cpl->add (reel);
cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
cpl->set_main_sound_sample_rate (48000);
dcp.add (cpl);
dcp.write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> 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 {};
}
boost::filesystem::path const dir("build/test/verify_test24");
prepare_directory (dir);
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ auto reel = make_shared<dcp::Reel>();
reel->add (black_picture_asset(dir));
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
cpl->add (reel);
cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
cpl->set_main_sound_sample_rate (48000);
e.replace ("MainSound", "MainSoundX");
}
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 4);
-
- list<dcp::VerificationNote>::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 }
+ });
}
boost::filesystem::path const dir("build/test/verify_test25");
prepare_directory (dir);
- boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
- shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
-
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ auto reel = make_shared<dcp::Reel>();
+ reel->add (black_picture_asset(dir));
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
cpl->add (reel);
cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
cpl->set_main_sound_sample_rate (48000);
{
Editor e (find_cpl("build/test/verify_test25"));
- e.replace ("</MainPictureActiveArea>", "</MainPictureActiveArea><BadTag></BadTag>");
+ e.replace ("meta:Width", "meta:WidthX");
}
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ check_verify_result (
+ { dir },
+ {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::GENERAL_READ }}
+ );
}
boost::filesystem::path const dir("build/test/verify_test26");
prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
asset->_language = "wrong-andbad";
asset->write (dir / "subs.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
reel_asset->_language = "badlang";
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ write_dcp_with_single_asset (dir, reel_asset);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), 2U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ auto i = notes.begin();
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (*i->note(), "badlang");
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");
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
asset->_language = "wrong-andbad";
asset->write (dir / "subs.mxf");
- shared_ptr<dcp::ReelClosedCaptionAsset> reel_asset(new dcp::ReelClosedCaptionAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ auto reel_asset = make_shared<dcp::ReelClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
reel_asset->_language = "badlang";
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ write_dcp_with_single_asset (dir, reel_asset);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), 2U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ auto i = notes.begin ();
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (*i->note(), "badlang");
boost::filesystem::path const dir("build/test/verify_various_invalid_languages");
prepare_directory (dir);
- shared_ptr<dcp::MonoPictureAsset> picture = simple_picture (dir, "foo");
- shared_ptr<dcp::ReelPictureAsset> reel_picture(new dcp::ReelMonoPictureAsset(picture, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ auto picture = simple_picture (dir, "foo");
+ auto reel_picture = make_shared<dcp::ReelMonoPictureAsset>(picture, 0);
+ auto reel = make_shared<dcp::Reel>();
reel->add (reel_picture);
- shared_ptr<dcp::SoundAsset> sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz");
- shared_ptr<dcp::ReelSoundAsset> reel_sound(new dcp::ReelSoundAsset(sound, 0));
+ auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz");
+ auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
reel->add (reel_sound);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ auto cpl = make_shared<dcp::CPL>("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_picture_stored_area (dcp::Size(1998, 1080));
cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
cpl->_release_territory = "fred-jim";
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+ dump_notes (notes);
BOOST_REQUIRE_EQUAL (notes.size(), 4U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ 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");
shared_ptr<dcp::PictureAsset> mp;
if (three_d) {
- mp.reset (new dcp::StereoPictureAsset(dcp::Fraction(frame_rate, 1), dcp::SMPTE));
+ mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::SMPTE);
} else {
- mp.reset (new dcp::MonoPictureAsset(dcp::Fraction(frame_rate, 1), dcp::SMPTE));
+ mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::SMPTE);
}
- shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (dcp_path / "video.mxf", false);
+ auto picture_writer = mp->start_write (dcp_path / "video.mxf", false);
- shared_ptr<dcp::OpenJPEGImage> image = black_image (dcp::Size(width, height));
- dcp::ArrayData j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
+ 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 ();
- shared_ptr<dcp::DCP> d (new dcp::DCP(dcp_path));
- shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::FEATURE));
+ auto d = make_shared<dcp::DCP>(dcp_path);
+ auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::FEATURE);
cpl->set_annotation_text ("A Test DCP");
cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ auto reel = make_shared<dcp::Reel>();
if (three_d) {
- reel->add (
- shared_ptr<dcp::ReelPictureAsset>(
- new dcp::ReelStereoPictureAsset(
- std::dynamic_pointer_cast<dcp::StereoPictureAsset>(mp),
- 0)
- )
- );
+ reel->add (make_shared<dcp::ReelStereoPictureAsset>(std::dynamic_pointer_cast<dcp::StereoPictureAsset>(mp), 0));
} else {
- reel->add (
- shared_ptr<dcp::ReelPictureAsset>(
- new dcp::ReelMonoPictureAsset(
- std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp),
- 0)
- )
- );
+ reel->add (make_shared<dcp::ReelMonoPictureAsset>(std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp), 0));
}
cpl->add (reel);
d->add (cpl);
d->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dcp_path);
- return dcp::verify (dirs, &stage, &progress, xsd_test);
+ return dcp::verify ({dcp_path}, &stage, &progress, xsd_test);
}
void
check_picture_size_ok (int width, int height, int frame_rate, bool three_d)
{
- list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, three_d);
+ auto notes = check_picture_size(width, height, frame_rate, three_d);
dump_notes (notes);
BOOST_CHECK_EQUAL (notes.size(), 0U);
}
void
check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool three_d)
{
- list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, 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);
void
check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, bool three_d)
{
- list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, 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);
void
check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, bool three_d)
{
- list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, 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);
check_picture_size_bad_4k_frame_rate (3996, 2160, 48, false);
/* No 4K 3D */
- list<dcp::VerificationNote> notes = check_picture_size(3996, 2160, 24, true);
+ 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);
boost::filesystem::path const dir("build/test/verify_closed_caption_xml_too_large");
prepare_directory (dir);
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset());
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>();
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");
- shared_ptr<dcp::ReelClosedCaptionAsset> reel_asset(new dcp::ReelClosedCaptionAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
-
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 3U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_START_TIME);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
- ++i;
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES);
+ auto reel_asset = make_shared<dcp::ReelClosedCaptionAsset>(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_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES }
+ });
}
shared_ptr<dcp::SMPTESubtitleAsset>
make_large_subtitle_asset (boost::filesystem::path font_file)
{
- shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset());
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>();
dcp::ArrayData big_fake_font(1024 * 1024);
big_fake_font.write (font_file);
for (int i = 0; i < 116; ++i) {
void
verify_timed_text_asset_too_large (string name)
{
- boost::filesystem::path const dir = boost::filesystem::path("build/test") / name;
+ auto const dir = boost::filesystem::path("build/test") / name;
prepare_directory (dir);
- shared_ptr<dcp::SMPTESubtitleAsset> asset = make_large_subtitle_asset (dir / "font.ttf");
+ 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");
- shared_ptr<T> reel_asset(new T(asset, dcp::Fraction(24, 1), 16 * 24, 0));
- shared_ptr<dcp::Reel> reel(new dcp::Reel());
- reel->add (reel_asset);
- shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
- cpl->add (reel);
- shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
-
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 4U);
- dump_notes (notes);
- list<dcp::VerificationNote>::const_iterator i = notes.begin();
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::TIMED_TEXT_ASSET_TOO_LARGE_IN_BYTES);
- ++i;
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::TIMED_TEXT_FONTS_TOO_LARGE_IN_BYTES);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_START_TIME);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
+ auto reel_asset = make_shared<T>(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::filesystem::path dir = "build/test/verify_missing_language_tag_in_subtitle_xml";
prepare_directory (dir);
- shared_ptr<dcp::DCP> dcp = make_simple (dir, 1);
+ auto dcp = make_simple (dir, 1);
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"</SubtitleList>"
"</SubtitleReel>";
- FILE* xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ 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);
- shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset(dir / "subs.xml"));
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_subs (new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 100, 0));
- dcp->cpls().front()->reels().front()->add (reel_subs);
+ auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 100, 0);
+ dcp->cpls().front()->reels().front()->add(reel_subs);
dcp->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- auto notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 2U);
- auto i = notes.begin();
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_LANGUAGE);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
+ 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");
- shared_ptr<dcp::DCP> dcp = make_simple (path, 2);
- shared_ptr<dcp::CPL> cpl = dcp->cpls().front();
+ auto dcp = make_simple (path, 2);
+ auto cpl = dcp->cpls().front();
{
- shared_ptr<dcp::SMPTESubtitleAsset> subs(new dcp::SMPTESubtitleAsset());
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>();
subs->set_language (dcp::LanguageTag("de-DE"));
subs->add (simple_subtitle());
subs->write (path / "subs1.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_subs(new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 240, 0));
- cpl->reels().front()->add (reel_subs);
+ auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+ cpl->reels().front()->add(reel_subs);
}
{
- shared_ptr<dcp::SMPTESubtitleAsset> subs(new dcp::SMPTESubtitleAsset());
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>();
subs->set_language (dcp::LanguageTag("en-US"));
subs->add (simple_subtitle());
subs->write (path / "subs2.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_subs(new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 240, 0));
- cpl->reels().back()->add (reel_subs);
+ auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+ cpl->reels().back()->add(reel_subs);
}
dcp->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (path);
- list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 3U);
- list<dcp::VerificationNote>::const_iterator i = notes.begin();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_START_TIME);
- ++i;
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_START_TIME);
+ 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::filesystem::path dir = "build/test/verify_missing_start_time_tag_in_subtitle_xml";
prepare_directory (dir);
- shared_ptr<dcp::DCP> dcp = make_simple (dir, 1);
+ auto dcp = make_simple (dir, 1);
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"</SubtitleList>"
"</SubtitleReel>";
- FILE* xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ 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);
- shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset(dir / "subs.xml"));
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_subs (new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 100, 0));
- dcp->cpls().front()->reels().front()->add (reel_subs);
+ auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 100, 0);
+ dcp->cpls().front()->reels().front()->add(reel_subs);
dcp->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- auto notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 2U);
- auto i = notes.begin();
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_SUBTITLE_START_TIME);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
+ 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::filesystem::path dir = "build/test/verify_non_zero_start_time_tag_in_subtitle_xml";
prepare_directory (dir);
- shared_ptr<dcp::DCP> dcp = make_simple (dir, 1);
+ auto dcp = make_simple (dir, 1);
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"</SubtitleList>"
"</SubtitleReel>";
- FILE* xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ 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);
- shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset(dir / "subs.xml"));
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
- shared_ptr<dcp::ReelSubtitleAsset> reel_subs (new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 100, 0));
- dcp->cpls().front()->reels().front()->add (reel_subs);
+ auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 100, 0);
+ dcp->cpls().front()->reels().front()->add(reel_subs);
dcp->write_xml (dcp::SMPTE);
- vector<boost::filesystem::path> dirs;
- dirs.push_back (dir);
- auto notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 2U);
- auto i = notes.begin();
- BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::SUBTITLE_START_TIME_NON_ZERO);
- ++i;
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
+ 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 }
+ });
}
asset->write (dir / "subs.mxf");
auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
- auto reel = make_shared<dcp::Reel>();
- reel->add (reel_asset);
- auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
- cpl->add (reel);
- auto dcp = make_shared<dcp::DCP>(dir);
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ write_dcp_with_single_asset (dir, reel_asset);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 1U);
- auto i = notes.begin();
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::FIRST_TEXT_TOO_EARLY);
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY }
+ });
}
asset->write (dir / "subs.mxf");
auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
- auto reel = make_shared<dcp::Reel>();
- reel->add (reel_asset);
- auto cpl = make_shared<dcp::CPL>("hello", dcp::FEATURE);
- cpl->add (reel);
- auto dcp = make_shared<dcp::DCP>(dir);
- dcp->add (cpl);
- dcp->write_xml (dcp::SMPTE);
+ write_dcp_with_single_asset (dir, reel_asset);
auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
dump_notes (notes);
projects / libdcp.git / commitdiff