#include "reel_closed_caption_asset.h"
#include "reel_stereo_picture_asset.h"
#include "reel_subtitle_asset.h"
+#include "reel_markers_asset.h"
#include "compose.hpp"
#include "test.h"
#include <boost/test/unit_test.hpp>
using std::shared_ptr;
-static list<pair<string, optional<boost::filesystem::path> > > stages;
+static list<pair<string, optional<boost::filesystem::path>>> stages;
+static string const dcp_test1_pkl = "pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml";
+static string const dcp_test1_cpl = "cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml";
static void
stage (string s, optional<boost::filesystem::path> p)
{
auto reel = make_shared<dcp::Reel>();
reel->add (reel_asset);
+ reel->add (simple_markers());
+
auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
cpl->add (reel);
auto dcp = make_shared<dcp::DCP>(dir);
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);
- dump_notes (notes);
BOOST_REQUIRE_EQUAL (notes.size(), types_and_codes.size());
auto i = notes.begin();
auto j = types_and_codes.begin();
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 cpl_file = boost::filesystem::path("build") / "test" / "verify_test1" / dcp_test1_cpl;
+ boost::filesystem::path const pkl_file = boost::filesystem::path("build") / "test" / "verify_test1" / dcp_test1_pkl;
boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml";
auto st = stages.begin();
auto directories = setup (1, 3);
{
- Editor e ("build/test/verify_test3/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml");
+ Editor e (boost::filesystem::path("build") / "test" / "verify_test3" / dcp_test1_pkl);
e.replace ("<Hash>", "<Hash>x");
}
auto directories = setup (1, 4);
{
- Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
+ Editor e (boost::filesystem::path("build") / "test" / "verify_test4" / dcp_test1_cpl);
e.replace ("<ContentKind>", "<ContentKind>x");
}
boost::filesystem::path
cpl (int n)
{
- return dcp::String::compose("build/test/verify_test%1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml", n);
+ return dcp::String::compose("build/test/verify_test%1/%2", n, dcp_test1_cpl);
}
static
boost::filesystem::path
pkl (int n)
{
- return dcp::String::compose("build/test/verify_test%1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml", n);
+ return dcp::String::compose("build/test/verify_test%1/%2", n, dcp_test1_pkl);
}
static
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::XML_VALIDATION_ERROR,
+ dcp::VerificationNote::XML_VALIDATION_ERROR,
+ dcp::VerificationNote::XML_VALIDATION_ERROR,
dcp::VerificationNote::XML_VALIDATION_ERROR,
dcp::VerificationNote::CPL_HASH_INCORRECT }
);
{
check_verify_result_after_replace (
11, &pkl,
- "<Id>urn:uuid:cd4", "<Id>urn:uuid:xd4",
+ "<Id>urn:uuid:2b9", "<Id>urn:uuid:xb9",
{ dcp::VerificationNote::XML_VALIDATION_ERROR }
);
}
{
check_verify_result_after_replace (
12, &asset_map,
- "<Id>urn:uuid:63c", "<Id>urn:uuid:x3c",
+ "<Id>urn:uuid:07e", "<Id>urn:uuid:x7e",
{ dcp::VerificationNote::XML_VALIDATION_ERROR }
);
}
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 cpl_file = boost::filesystem::path("build") / "test" / "verify_test13" / "cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
+ boost::filesystem::path const pkl_file = boost::filesystem::path("build") / "test" / "verify_test13" / "pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
boost::filesystem::path const assetmap_file = "build/test/verify_test13/ASSETMAP";
auto st = stages.begin();
check_verify_result (
{ dir },
- {{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES }}
- );
+ {
+ { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
check_verify_result (
{ dir },
- {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES }}
- );
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
boost::filesystem::remove_all (dir);
dcp_from_frame (frame, dir);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 0);
+ check_verify_result ({ dir }, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
write_dcp_with_single_asset (dir, reel_asset);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 0);
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
{ 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 }
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
});
}
check_verify_result (
{ vf_dir },
- {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::EXTERNAL_ASSET }});
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::EXTERNAL_ASSET },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
auto reel = make_shared<dcp::Reel>();
reel->add (reel_asset);
+
+ reel->add (simple_markers(16 * 24 - 1));
+
auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
cpl->add (reel);
cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
dcp.add (cpl);
dcp.write_xml (dcp::SMPTE);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_CHECK (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
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->set_version_number (1);
+
+ reel->add (simple_markers());
dcp::DCP dcp (dir);
dcp.add (cpl);
write_dcp_with_single_asset (dir, reel_asset);
auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ BOOST_REQUIRE_EQUAL (notes.size(), 3U);
auto i = notes.begin();
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad");
+ i++;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_CPL_METADATA);
}
write_dcp_with_single_asset (dir, reel_asset);
auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ BOOST_REQUIRE_EQUAL (notes.size(), 3U);
auto i = notes.begin ();
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad");
+ i++;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::MISSING_CPL_METADATA);
}
auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz");
auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
reel->add (reel_sound);
+ reel->add (simple_markers());
+
auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
cpl->add (reel);
cpl->_additional_subtitle_languages.push_back("this-is-wrong");
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->set_version_number (1);
cpl->_release_territory = "fred-jim";
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
BOOST_REQUIRE (i->note());
BOOST_CHECK_EQUAL (*i->note(), "frobozz");
- ++i;
}
auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
cpl->set_annotation_text ("A Test DCP");
cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+ 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(1998, 1080));
+ cpl->set_version_number (1);
auto reel = make_shared<dcp::Reel>();
reel->add (make_shared<dcp::ReelMonoPictureAsset>(std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp), 0));
}
+ reel->add (simple_markers(frame_rate));
+
cpl->add (reel);
d->add (cpl);
{
{ 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 }
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA },
});
}
{ 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 }
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA },
});
}
dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
check_verify_result (
{ dir },
- {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY }});
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::FIRST_TEXT_TOO_EARLY },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
+
}
auto const dir = boost::filesystem::path("build/test/verify_text_not_too_early");
/* Just late enough */
dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
auto reel_asset1 = make_shared<dcp::ReelSubtitleAsset>(asset1, dcp::Fraction(24, 1), 16 * 24, 0);
auto reel1 = make_shared<dcp::Reel>();
reel1->add (reel_asset1);
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 16 * 24, 0);
+ markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+ reel1->add (markers1);
auto asset2 = make_shared<dcp::SMPTESubtitleAsset>();
asset2->set_start_time (dcp::Time());
auto reel_asset2 = make_shared<dcp::ReelSubtitleAsset>(asset2, dcp::Fraction(24, 1), 16 * 24, 0);
auto reel2 = make_shared<dcp::Reel>();
reel2->add (reel_asset2);
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 16 * 24, 0);
+ markers2->set (dcp::Marker::LFOC, dcp::Time(16 * 24 - 1, 24, 24));
+ reel2->add (markers2);
auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
cpl->add (reel1);
dcp->add (cpl);
dcp->write_xml (dcp::SMPTE);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{ 4 * 24, 5 * 24 },
{ 5 * 24 + 1, 6 * 24 },
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_CLOSE }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_CLOSE },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 4 * 24, 5 * 24 },
{ 5 * 24 + 16, 8 * 24 },
});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
auto const dir = boost::filesystem::path("build/test/verify_text_too_short");
dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_SHORT }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_TOO_SHORT },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{
auto const dir = boost::filesystem::path("build/test/verify_text_not_too_short");
dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{ 96, 200, 0.2, "four" },
{ 96, 200, 0.3, "lines" }
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES}});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 96, 200, 0.1, "have" },
{ 96, 200, 0.2, "four" },
});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{ 150, 180, 0.2, "four" },
{ 150, 180, 0.3, "lines" }
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES}});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::TOO_MANY_SUBTITLE_LINES },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 150, 180, 0.2, "four" },
{ 190, 250, 0.3, "lines" }
});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
{ 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" }
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_LONGER_THAN_RECOMMENDED }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_LONGER_THAN_RECOMMENDED },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{
{ 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_TOO_LONG }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::SUBTITLE_LINE_TOO_LONG },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 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}});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TOO_MANY_CLOSED_CAPTION_LINES},
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 96, 200, 0.1, "have" },
{ 96, 200, 0.2, "four" },
});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{ 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}});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::TOO_MANY_CLOSED_CAPTION_LINES},
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{ 150, 180, 0.2, "four" },
{ 190, 250, 0.3, "lines" }
});
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
{ 96, 300, 0.0, "0123456789012345678901234567890123" }
});
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_LINE_TOO_LONG }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_LINE_TOO_LONG },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "de-DE", 24, 96000);
auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
reel->add (reel_sound);
+ reel->add (simple_markers());
auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
cpl->add (reel);
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (dcp::SMPTE);
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_SOUND_FRAME_RATE }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_SOUND_FRAME_RATE },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (dir, "", 24);
shared_ptr<dcp::SoundAsset> ms = simple_sound (dir, "", dcp::MXFMetadata(), "en-US", 25);
- cpl->add (
- make_shared<dcp::Reel>(
- make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
- make_shared<dcp::ReelSoundAsset>(ms, 0)
- )
- );
+ auto reel = make_shared<dcp::Reel>(
+ make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+ make_shared<dcp::ReelSoundAsset>(ms, 0)
+ );
+
+ reel->add (simple_markers());
+ cpl->add (reel);
dcp->add (cpl);
dcp->write_xml (dcp::SMPTE);
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_ASSET_DURATION }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_ASSET_DURATION },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
reel1->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
}
- cpl->add (reel1);
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+ markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+ reel1->add (markers1);
+ cpl->add (reel1);
auto reel2 = make_shared<dcp::Reel>(
make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
reel2->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
}
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+ markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+ reel2->add (markers2);
+
cpl->add (reel2);
dcp->add (cpl);
{
boost::filesystem::path dir ("build/test/verify_subtitles_must_be_in_all_reels1");
verify_subtitles_must_be_in_all_reels_check (dir, true, false);
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MAIN_SUBTITLE_NOT_IN_ALL_REELS}});
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MAIN_SUBTITLE_NOT_IN_ALL_REELS },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
+
}
{
boost::filesystem::path dir ("build/test/verify_subtitles_must_be_in_all_reels2");
verify_subtitles_must_be_in_all_reels_check (dir, true, true);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
boost::filesystem::path dir ("build/test/verify_subtitles_must_be_in_all_reels1");
verify_subtitles_must_be_in_all_reels_check (dir, false, false);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
}
reel1->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
}
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+ markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+ reel1->add (markers1);
+
cpl->add (reel1);
auto reel2 = make_shared<dcp::Reel>(
reel2->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
}
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+ markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+ reel2->add (markers2);
+
cpl->add (reel2);
dcp->add (cpl);
{
boost::filesystem::path dir ("build/test/verify_closed_captions_must_be_in_all_reels1");
verify_closed_captions_must_be_in_all_reels_check (dir, 3, 4);
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_ASSET_COUNTS_DIFFER }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CLOSED_CAPTION_ASSET_COUNTS_DIFFER },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{
boost::filesystem::path dir ("build/test/verify_closed_captions_must_be_in_all_reels2");
verify_closed_captions_must_be_in_all_reels_check (dir, 4, 4);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
{
boost::filesystem::path dir ("build/test/verify_closed_captions_must_be_in_all_reels3");
verify_closed_captions_must_be_in_all_reels_check (dir, 0, 0);
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE (notes.empty());
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }});
}
}
reel->add (reel_text);
+ reel->add (simple_markers(240));
+
cpl->add (reel);
dcp->add (cpl);
dcp->write_xml (dcp::SMPTE);
- check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, code }});
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, code },
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA }
+ });
}
{
BOOST_REQUIRE (dcp->cpls()[0]->file());
Editor e(dcp->cpls()[0]->file().get());
- e.replace("<Hash>cb1OLhgHG9svy7G8hoTSPpltzhw=</Hash>", "");
+ e.replace("<Hash>XGhFVrqZqapOJx5Fh2SLjj48Yjg=</Hash>", "");
}
check_verify_result (
});
}
+
+static
+void
+verify_markers_test (
+ boost::filesystem::path dir,
+ vector<pair<dcp::Marker, dcp::Time>> markers,
+ vector<std::pair<dcp::VerificationNote::Type, dcp::VerificationNote::Code>> types_and_codes
+ )
+{
+ auto dcp = make_simple (dir);
+ dcp->cpls()[0]->set_content_kind (dcp::FEATURE);
+ auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24, 0);
+ for (auto const& i: markers) {
+ markers_asset->set (i.first, i.second);
+ }
+ dcp->cpls()[0]->reels()[0]->add(markers_asset);
+ dcp->write_xml (dcp::SMPTE);
+ check_verify_result ({dir}, types_and_codes);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_markers)
+{
+ verify_markers_test (
+ "build/test/verify_markers_all_correct",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+ },
+ {}
+ );
+
+ verify_markers_test (
+ "build/test/verify_markers_missing_ffec",
+ {
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFEC_IN_FEATURE }
+ });
+
+ verify_markers_test (
+ "build/test/verify_markers_missing_ffmc",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFMC_IN_FEATURE }
+ });
+
+ verify_markers_test (
+ "build/test/verify_markers_missing_ffoc",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_FFOC}
+ });
+
+ verify_markers_test (
+ "build/test/verify_markers_missing_lfoc",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(1, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_LFOC }
+ });
+
+ verify_markers_test (
+ "build/test/verify_markers_incorrect_ffoc",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(3, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INCORRECT_FFOC }
+ });
+
+ verify_markers_test (
+ "build/test/verify_markers_incorrect_lfoc",
+ {
+ { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+ { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+ { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+ { dcp::Marker::LFOC, dcp::Time(18, 24, 24) }
+ },
+ {
+ { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INCORRECT_LFOC }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_cpl_metadata_version)
+{
+ boost::filesystem::path dir = "build/test/verify_cpl_metadata_version";
+ prepare_directory (dir);
+ auto dcp = make_simple (dir);
+ dcp->cpls()[0]->unset_version_number();
+ dcp->write_xml (dcp::SMPTE);
+ check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER }});
+}
+
projects / libdcp.git / blobdiff