files in the program, then also delete it here.
*/
+
#include "compose.hpp"
#include "cpl.h"
#include "dcp.h"
+#include "file.h"
#include "interop_subtitle_asset.h"
#include "j2k_transcode.h"
#include "mono_picture_asset.h"
#include "util.h"
#include "verify.h"
#include "verify_j2k.h"
-#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/random.hpp>
+#include <boost/test/unit_test.hpp>
#include <cstdio>
#include <iostream>
using std::list;
+using std::make_pair;
+using std::make_shared;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
-using std::make_pair;
-using std::make_shared;
using boost::optional;
using namespace boost::filesystem;
-using std::shared_ptr;
static list<pair<string, optional<path>>> stages;
-static string const dcp_test1_pkl_id = "6af1e0c1-c441-47f8-a502-3efd46b1fa4f";
-static string const dcp_test1_pkl = "pkl_" + dcp_test1_pkl_id + ".xml";
-static string const dcp_test1_cpl_id = "81fb54df-e1bf-4647-8788-ea7ba154375b";
-static string const dcp_test1_cpl = "cpl_" + dcp_test1_cpl_id + ".xml";
-static string const dcp_test1_asset_map_id = "5d51e8a1-b2a5-4da6-9b66-4615c3609440";
-static string const encryption_test_cpl_id = "81fb54df-e1bf-4647-8788-ea7ba154375b";
-static string const encryption_test_pkl_id = "627ad740-ae36-4c49-92bb-553a9f09c4f8";
+
+static string filename_to_id(boost::filesystem::path path)
+{
+ return path.string().substr(4, path.string().length() - 8);
+}
+
+static boost::filesystem::path const dcp_test1_pkl = find_file("test/ref/DCP/dcp_test1", "pkl_").filename();
+static string const dcp_test1_pkl_id = filename_to_id(dcp_test1_pkl);
+
+static boost::filesystem::path const dcp_test1_cpl = find_file("test/ref/DCP/dcp_test1", "cpl_").filename();
+static string const dcp_test1_cpl_id = filename_to_id(dcp_test1_cpl);
+
+static string const dcp_test1_asset_map_id = "017b3de4-6dda-408d-b19b-6711354b0bc3";
+
+static boost::filesystem::path const encryption_test_cpl = find_file("test/ref/DCP/encryption_test", "cpl_").filename();
+static string const encryption_test_cpl_id = filename_to_id(encryption_test_cpl);
+
+static boost::filesystem::path const encryption_test_pkl = find_file("test/ref/DCP/encryption_test", "pkl_").filename();
+static string const encryption_test_pkl_id = filename_to_id(encryption_test_pkl);
static void
stage (string s, optional<path> p)
}
+/** Copy dcp_test{reference_number} to build/test/verify_test{verify_test_suffix}
+ * to make a new sacrificial test DCP.
+ */
static path
setup (int reference_number, string verify_test_suffix)
{
cpl->add (reel);
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
+ dcp->set_annotation_text("hello");
+ dcp->write_xml ();
return cpl;
}
-/** 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.
- */
-class Editor
-{
-public:
- Editor (path path)
- : _path(path)
- {
- _content = dcp::file_to_string (_path);
- }
-
- ~Editor ()
- {
- auto f = fopen(_path.string().c_str(), "w");
- BOOST_REQUIRE (f);
- fwrite (_content.c_str(), _content.length(), 1, f);
- fclose (f);
- }
-
- void replace (string a, string b)
- {
- auto old_content = _content;
- boost::algorithm::replace_all (_content, a, b);
- BOOST_REQUIRE (_content != old_content);
- }
-
- void delete_lines (string from, string to)
- {
- vector<string> lines;
- boost::algorithm::split (lines, _content, boost::is_any_of("\r\n"), boost::token_compress_on);
- bool deleting = false;
- auto old_content = _content;
- _content = "";
- for (auto i: lines) {
- if (i.find(from) != string::npos) {
- deleting = true;
- }
- if (!deleting) {
- _content += i + "\n";
- }
- if (deleting && i.find(to) != string::npos) {
- deleting = false;
- }
- }
- BOOST_REQUIRE (_content != old_content);
- }
-
-private:
- path _path;
- std::string _content;
-};
-
-
LIBDCP_DISABLE_WARNINGS
static
void
void
check_verify_result (vector<path> dir, vector<dcp::VerificationNote> test_notes)
{
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), test_notes.size());
- for (auto i = 0U; i < notes.size(); ++i) {
- BOOST_REQUIRE_EQUAL (notes[i], test_notes[i]);
+ auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
+ std::sort (notes.begin(), notes.end());
+ std::sort (test_notes.begin(), test_notes.end());
+
+ string message = "\nVerification notes from test:\n";
+ for (auto i: notes) {
+ message += " " + note_to_string(i) + "\n";
+ message += dcp::String::compose(
+ " [%1 %2 %3 %4 %5]\n",
+ static_cast<int>(i.type()),
+ static_cast<int>(i.code()),
+ i.note().get_value_or("<none>"),
+ i.file().get_value_or("<none>"),
+ i.line().get_value_or(0)
+ );
+ }
+ message += "Expected:\n";
+ for (auto i: test_notes) {
+ message += " " + note_to_string(i) + "\n";
+ message += dcp::String::compose(
+ " [%1 %2 %3 %4 %5]\n",
+ static_cast<int>(i.type()),
+ static_cast<int>(i.code()),
+ i.note().get_value_or("<none>"),
+ i.file().get_value_or("<none>"),
+ i.line().get_value_or(0)
+ );
}
+
+ BOOST_REQUIRE_MESSAGE (notes == test_notes, message);
}
+/* Copy dcp_test1 to build/test/verify_test{suffix} then edit a file found by the functor 'file',
+ * replacing from with to. Verify the resulting DCP and check that the results match the given
+ * list of codes.
+ */
static
void
check_verify_result_after_replace (string suffix, boost::function<path (string)> file, string from, string to, vector<dcp::VerificationNote::Code> codes)
e.replace (from, to);
}
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+ auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), codes.size());
auto i = notes.begin();
}
+static
+void
+add_font(shared_ptr<dcp::SubtitleAsset> asset)
+{
+ dcp::ArrayData fake_font(1024);
+ asset->add_font("font", fake_font);
+}
+
+
BOOST_AUTO_TEST_CASE (verify_no_error)
{
stages.clear ();
auto dir = setup (1, "no_error");
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+ auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
path const cpl_file = dir / dcp_test1_cpl;
path const pkl_file = dir / dcp_test1_pkl;
++st;
BOOST_REQUIRE (st == stages.end());
- BOOST_CHECK_EQUAL (notes.size(), 0);
+ BOOST_CHECK_EQUAL (notes.size(), 0U);
}
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xSEEi70vx1WQs67bmu2zKvzIkXvY=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xaddO7je2lZSNQp55qjCWo5DLKFQ=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xWU0/u1wM17y7Kriq06+65/ViX1o=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 28 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xtfX1mVIKJCVr1m7Y32Nzxf0+Rpw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xwUmt8G+cFFKMGt0ueS9+F1S4uhc=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 20 },
});
}
check_verify_result (
{ dir },
- {{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("Bad content kind 'xtrailer'")}}
- );
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("xtrailer") }
+ });
}
/* There's no MISMATCHED_CPL_HASHES error here because it can't find the correct hash by ID (since the ID is wrong) */
check_verify_result_after_replace (
"invalid_xml_cpl_id", &cpl,
- "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
+ "<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab", "<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358a",
{ dcp::VerificationNote::Code::INVALID_XML }
);
}
BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
{
check_verify_result_after_replace (
- "invalix_xml_asset_map_id", &asset_map,
+ "invalid_xml_asset_map_id", &asset_map,
"<Id>urn:uuid:" + dcp_test1_asset_map_id.substr(0, 3),
"<Id>urn:uuid:x" + dcp_test1_asset_map_id.substr(1, 2),
{ dcp::VerificationNote::Code::INVALID_XML }
{
stages.clear ();
auto dir = setup (3, "verify_invalid_standard");
- auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+ auto notes = dcp::verify({dir}, &stage, &progress, {}, xsd_test);
path const cpl_file = dir / "cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
path const pkl_file = dir / "pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
BOOST_AUTO_TEST_CASE (verify_invalid_duration)
{
auto dir = setup (8, "invalid_duration");
+
+ dcp::DCP dcp(dir);
+ dcp.read();
+ BOOST_REQUIRE(dcp.cpls().size() == 1);
+ auto cpl = dcp.cpls()[0];
+
check_verify_result (
{ dir },
{
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2") }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2") },
+ dcp::VerificationNote(
+ dcp::VerificationNote::Type::WARNING,
+ dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT,
+ cpl->file().get()
+ ).set_id("d74fda30-d5f4-4c5f-870f-ebc089d97eb7")
});
}
{
auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
create_directories (dir);
- auto writer = asset->start_write (dir / "pic.mxf", true);
+ auto writer = asset->start_write(dir / "pic.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
for (int i = 0; i < 24; ++i) {
writer->write (frame.data(), frame.size());
}
auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
- check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD }});
+ check_verify_result (
+ {dir}, {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
+{
+ path const dir("build/test/verify_catch_missing_font_file_with_interop_ccap");
+ prepare_directory(dir);
+ copy_file("test/data/subs1.xml", dir / "ccap.xml");
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "ccap.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ {dir}, {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+ });
}
string("element 'Foo' is not allowed for content model '(SubtitleID,MovieTitle,ReelNumber,Language,LoadFont*,Font*,Subtitle*)'"),
path(),
29
- }
+ },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
+{
+ path const dir("build/test/verify_interop_subtitle_asset_with_no_subtitles");
+ prepare_directory(dir);
+ copy_file("test/data/subs4.xml", dir / "subs.xml");
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+ });
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
+{
+ path const dir("build/test/verify_interop_subtitle_asset_with_single_space_subtitle");
+ prepare_directory(dir);
+ copy_file("test/data/subs5.xml", dir / "subs.xml");
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"} }
});
+
}
auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
auto cpl = write_dcp_with_single_asset (dir, reel_asset);
- check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+ check_verify_result(
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"} },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+ });
}
},
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2020-05-09T00:29:21.000+02:00"} },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
+{
+ path const dir("build/test/verify_empty_text_node_in_subtitles");
+ prepare_directory (dir);
+ copy_file ("test/data/empty_text.mxf", dir / "subs.mxf");
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+ auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+ auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-08-09T18:34:46.000+02:00"} },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+ });
+}
+
+
+/** A <Text> node with no content except some <Font> nodes, which themselves do have content */
+BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_child_nodes)
+{
+ path const dir("build/test/verify_empty_text_node_in_subtitles_with_child_nodes");
+ prepare_directory (dir);
+ copy_file ("test/data/empty_but_with_children.xml", dir / "subs.xml");
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+ auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} }
+ });
+}
+
+
+/** A <Text> node with no content except some <Font> nodes, which themselves also have no content */
+BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes)
+{
+ path const dir("build/test/verify_empty_text_node_in_subtitles_with_empty_child_nodes");
+ prepare_directory (dir);
+ copy_file ("test/data/empty_with_empty_children.xml", dir / "subs.xml");
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+ auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} },
});
}
auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
cpl->add (reel);
- cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/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));
dcp::DCP dcp (dir);
dcp.add (cpl);
- dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
+ dcp.set_annotation_text("hello");
+ dcp.write_xml ();
+}
+
+
+path
+find_prefix(path dir, string prefix)
+{
+ auto iter = std::find_if(directory_iterator(dir), directory_iterator(), [prefix](path const& p) {
+ return boost::starts_with(p.filename().string(), prefix);
+ });
+
+ BOOST_REQUIRE(iter != directory_iterator());
+ return iter->path();
}
path find_cpl (path dir)
{
- for (auto i: directory_iterator(dir)) {
- if (boost::starts_with(i.path().filename().string(), "cpl_")) {
- return i.path();
- }
- }
+ return find_prefix(dir, "cpl_");
+}
+
+
+path
+find_pkl(path dir)
+{
+ return find_prefix(dir, "pkl_");
+}
- BOOST_REQUIRE (false);
- return {};
+
+path
+find_asset_map(path dir)
+{
+ return find_prefix(dir, "ASSETMAP");
}
reel->add (black_picture_asset(dir));
auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
cpl->add (reel);
- cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/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));
dcp::DCP dcp (dir);
dcp.add (cpl);
- dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
+ dcp.set_annotation_text("hello");
+ dcp.write_xml();
{
Editor e (find_cpl(dir));
check_verify_result (
{ dir },
{
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 54 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 55 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 50 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 51 },
{
dcp::VerificationNote::Type::ERROR,
dcp::VerificationNote::Code::INVALID_XML,
"MainSoundSampleRate,MainPictureStoredArea,MainPictureActiveArea,MainSubtitleLanguageList?,"
"ExtensionMetadataList?,)'"),
canonical(cpl->file().get()),
- 75
+ 71
},
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) },
});
reel->add (black_picture_asset(dir));
auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
cpl->add (reel);
- cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/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));
dcp::DCP dcp (dir);
dcp.add (cpl);
- dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
+ dcp.set_annotation_text("hello");
+ dcp.write_xml();
{
Editor e (find_cpl(dir));
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_configuration(dcp::MainSoundConfiguration("51/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<dcp::DCP>(dir);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
+ dcp->set_annotation_text("hello");
+ dcp->write_xml();
check_verify_result (
{ dir },
} else {
mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
}
- auto picture_writer = mp->start_write (dcp_path / "video.mxf", false);
+ auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
auto image = black_image (dcp::Size(width, height));
auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
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_configuration(dcp::MainSoundConfiguration("51/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_main_picture_stored_area(dcp::Size(width, height));
+ cpl->set_main_picture_active_area(dcp::Size(width, height));
cpl->set_version_number (1);
auto reel = make_shared<dcp::Reel>();
cpl->add (reel);
d->add (cpl);
- d->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ d->set_annotation_text("A Test DCP");
+ d->write_xml();
- return dcp::verify ({dcp_path}, &stage, &progress, xsd_test);
+ return dcp::verify({dcp_path}, &stage, &progress, {}, xsd_test);
}
static
void
-add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, string text = "Hello")
+add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, dcp::VAlign v_align = dcp::VAlign::CENTER, string text = "Hello")
{
asset->add (
- make_shared<dcp::SubtitleString>(
+ std::make_shared<dcp::SubtitleString>(
optional<string>(),
false,
false,
0,
dcp::HAlign::CENTER,
v_position,
- dcp::VAlign::CENTER,
+ v_align,
+ 0,
dcp::Direction::LTR,
text,
dcp::Effect::NONE,
dcp::Colour(),
dcp::Time(),
- dcp::Time()
+ dcp::Time(),
+ 0
)
);
}
for (int i = 0; i < 2048; ++i) {
add_test_subtitle (asset, i * 24, i * 24 + 20);
}
+ add_font(asset);
asset->set_language (dcp::LanguageTag("de-DE"));
asset->write (dir / "subs.mxf");
auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 49148, 0);
{
dcp::VerificationNote::Type::BV21_ERROR,
dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
- string("413262"),
+ string("419371"),
canonical(dir / "subs.mxf")
},
{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
check_verify_result (
{ dir },
{
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121696411"), canonical(dir / "subs.mxf") },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf") },
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
"<ContentTitleText>Content</ContentTitleText>"
"<AnnotationText>Annotation</AnnotationText>"
"</SubtitleList>"
"</SubtitleReel>";
- auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ dcp::File xml_file(dir / "subs.xml", "w");
BOOST_REQUIRE (xml_file);
- fwrite (xml.c_str(), xml.size(), 1, xml_file);
- fclose (xml_file);
+ xml_file.write(xml.c_str(), xml.size(), 1);
+ xml_file.close();
auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls()[0]->reels()[0]->add(reel_subs);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result (
{ dir },
auto subs = make_shared<dcp::SMPTESubtitleAsset>();
subs->set_language (dcp::LanguageTag("de-DE"));
subs->add (simple_subtitle());
+ add_font(subs);
subs->write (path / "subs1.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
cpl->reels()[0]->add(reel_subs);
auto subs = make_shared<dcp::SMPTESubtitleAsset>();
subs->set_language (dcp::LanguageTag("en-US"));
subs->add (simple_subtitle());
+ add_font(subs);
subs->write (path / "subs2.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
cpl->reels()[1]->add(reel_subs);
}
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result (
{ path },
auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
ccaps->set_language (dcp::LanguageTag("de-DE"));
ccaps->add (simple_subtitle());
+ add_font(ccaps);
ccaps->write (path / "subs1.mxf");
auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
cpl->reels()[0]->add(reel_ccaps);
auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
ccaps->set_language (dcp::LanguageTag("en-US"));
ccaps->add (simple_subtitle());
+ add_font(ccaps);
ccaps->write (path / "subs2.mxf");
auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
cpl->reels()[1]->add(reel_ccaps);
}
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result (
{ path },
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
"<ContentTitleText>Content</ContentTitleText>"
"<AnnotationText>Annotation</AnnotationText>"
"</SubtitleList>"
"</SubtitleReel>";
- auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ dcp::File xml_file(dir / "subs.xml", "w");
BOOST_REQUIRE (xml_file);
- fwrite (xml.c_str(), xml.size(), 1, xml_file);
- fclose (xml_file);
+ xml_file.write(xml.c_str(), xml.size(), 1);
+ xml_file.close();
auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls()[0]->reels()[0]->add(reel_subs);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result (
{ dir },
string const xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
"<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
"<ContentTitleText>Content</ContentTitleText>"
"<AnnotationText>Annotation</AnnotationText>"
"</SubtitleList>"
"</SubtitleReel>";
- auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ dcp::File xml_file(dir / "subs.xml", "w");
BOOST_REQUIRE (xml_file);
- fwrite (xml.c_str(), xml.size(), 1, xml_file);
- fclose (xml_file);
+ xml_file.write(xml.c_str(), xml.size(), 1);
+ xml_file.close();
auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
subs->write (dir / "subs.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls().front()->reels().front()->add(reel_subs);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result (
{ dir },
class TestText
{
public:
- TestText (int in_, int out_, float v_position_ = 0, string text_ = "Hello")
+ TestText (int in_, int out_, float v_position_ = 0, dcp::VAlign v_align_ = dcp::VAlign::CENTER, string text_ = "Hello")
: in(in_)
, out(out_)
, v_position(v_position_)
+ , v_align(v_align_)
, text(text_)
{}
int in;
int out;
float v_position;
+ dcp::VAlign v_align;
string text;
};
auto asset = make_shared<dcp::SMPTESubtitleAsset>();
asset->set_start_time (dcp::Time());
for (auto i: subs) {
- add_test_subtitle (asset, i.in, i.out, i.v_position, i.text);
+ add_test_subtitle (asset, i.in, i.out, i.v_position, i.v_align, i.text);
}
asset->set_language (dcp::LanguageTag("de-DE"));
+ add_font(asset);
asset->write (dir / "subs.mxf");
auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), asset->intrinsic_duration(), 0);
}
+template <class T>
+shared_ptr<dcp::CPL>
+dcp_with_text_from_file (path dir, boost::filesystem::path subs_xml)
+{
+ prepare_directory (dir);
+ auto asset = make_shared<dcp::SMPTESubtitleAsset>(subs_xml);
+ asset->set_start_time (dcp::Time());
+ asset->set_language (dcp::LanguageTag("de-DE"));
+
+ auto subs_mxf = dir / "subs.mxf";
+ asset->write (subs_mxf);
+
+ /* The call to write() puts the asset into the DCP correctly but it will have
+ * XML re-written by our parser. Overwrite the MXF using the given file's verbatim
+ * contents.
+ */
+ ASDCP::TimedText::MXFWriter writer;
+ ASDCP::WriterInfo writer_info;
+ writer_info.LabelSetType = ASDCP::LS_MXF_SMPTE;
+ unsigned int c;
+ Kumu::hex2bin (asset->id().c_str(), writer_info.AssetUUID, Kumu::UUID_Length, &c);
+ DCP_ASSERT (c == Kumu::UUID_Length);
+ ASDCP::TimedText::TimedTextDescriptor descriptor;
+ descriptor.ContainerDuration = asset->intrinsic_duration();
+ Kumu::hex2bin (asset->xml_id()->c_str(), descriptor.AssetID, ASDCP::UUIDlen, &c);
+ DCP_ASSERT (c == Kumu::UUID_Length);
+ ASDCP::Result_t r = writer.OpenWrite (subs_mxf.string().c_str(), writer_info, descriptor, 16384);
+ BOOST_REQUIRE (!ASDCP_FAILURE(r));
+ r = writer.WriteTimedTextResource (dcp::file_to_string(subs_xml));
+ BOOST_REQUIRE (!ASDCP_FAILURE(r));
+ writer.Finalize ();
+
+ auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), asset->intrinsic_duration(), 0);
+ return write_dcp_with_single_asset (dir, reel_asset);
+}
+
+
BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
{
auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
/* Just late enough */
add_test_subtitle (asset1, 4 * 24, 5 * 24);
asset1->set_language (dcp::LanguageTag("de-DE"));
+ add_font(asset1);
asset1->write (dir / "subs1.mxf");
auto reel_asset1 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset1, dcp::Fraction(24, 1), 5 * 24, 0);
auto reel1 = make_shared<dcp::Reel>();
reel1->add (reel_asset1);
- auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24, 0);
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24);
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());
+ add_font(asset2);
/* This would be too early on first reel but should be OK on the second */
add_test_subtitle (asset2, 3, 4 * 24);
asset2->set_language (dcp::LanguageTag("de-DE"));
auto reel_asset2 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset2, dcp::Fraction(24, 1), 4 * 24, 0);
auto reel2 = make_shared<dcp::Reel>();
reel2->add (reel_asset2);
- auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24, 0);
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24);
markers2->set (dcp::Marker::LFOC, dcp::Time(4 * 24 - 1, 24, 24));
reel2->add (markers2);
cpl->add (reel2);
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
-
+ dcp->set_annotation_text("hello");
+ dcp->write_xml();
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
}
auto asset = make_shared<dcp::SMPTESubtitleAsset>();
asset->set_start_time (dcp::Time());
add_test_subtitle (asset, 0, 4 * 24);
+ add_font(asset);
asset->set_language (dcp::LanguageTag("de-DE"));
asset->write (dir / "subs.mxf");
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 200, 0.0, "We" },
- { 96, 200, 0.1, "have" },
- { 96, 200, 0.2, "four" },
- { 96, 200, 0.3, "lines" }
+ { 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+ { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+ { 96, 200, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 200, 0.0, "We" },
- { 96, 200, 0.1, "have" },
- { 96, 200, 0.2, "four" },
+ { 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+ { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
});
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
}
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 300, 0.0, "We" },
- { 96, 300, 0.1, "have" },
- { 150, 180, 0.2, "four" },
- { 150, 180, 0.3, "lines" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+ { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+ { 150, 180, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 300, 0.0, "We" },
- { 96, 300, 0.1, "have" },
- { 150, 180, 0.2, "four" },
- { 190, 250, 0.3, "lines" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+ { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+ { 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
}
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
dir,
{
- { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
dir,
{
- { 96, 200, 0.0, "We" },
- { 96, 200, 0.1, "have" },
- { 96, 200, 0.2, "four" },
- { 96, 200, 0.3, "lines" }
+ { 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+ { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
+ { 96, 200, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
dir,
{
- { 96, 200, 0.0, "We" },
- { 96, 200, 0.1, "have" },
- { 96, 200, 0.2, "four" },
+ { 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
+ { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
});
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
}
auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
dir,
{
- { 96, 300, 0.0, "We" },
- { 96, 300, 0.1, "have" },
- { 150, 180, 0.2, "four" },
- { 150, 180, 0.3, "lines" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+ { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+ { 150, 180, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result (
{dir},
auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
dir,
{
- { 96, 300, 0.0, "We" },
- { 96, 300, 0.1, "have" },
- { 150, 180, 0.2, "four" },
- { 190, 250, 0.3, "lines" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
+ { 96, 300, 0.1, dcp::VAlign::CENTER, "have" },
+ { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
+ { 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
});
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
}
-BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
+BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
{
- auto const dir = path ("build/test/verify_invalid_closed_caption_line_length");
+ auto const dir = path ("build/test/verify_valid_closed_caption_line_length");
auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
dir,
{
- { 96, 300, 0.0, "0123456789012345678901234567890123" }
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
});
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH },
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
});
}
-BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
+BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
{
- path const dir("build/test/verify_invalid_sound_frame_rate");
- prepare_directory (dir);
-
- 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);
- 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::ContentKind::TRAILER, dcp::Standard::SMPTE);
- cpl->add (reel);
- auto dcp = make_shared<dcp::DCP>(dir);
- dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "hello"
- );
-
+ auto const dir = path ("build/test/verify_invalid_closed_caption_line_length");
+ auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+ dir,
+ {
+ { 96, 300, 0.0, dcp::VAlign::CENTER, "0123456789012345678901234567890123" }
+ });
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
});
}
-BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
+BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
{
- path const dir("build/test/verify_missing_cpl_annotation_text");
- auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
-
- BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
-
- auto const cpl = dcp->cpls()[0];
-
- {
- BOOST_REQUIRE (cpl->file());
- Editor e(cpl->file().get());
- e.replace("<AnnotationText>A Test DCP</AnnotationText>", "");
- }
-
+ auto const dir = path ("build/test/verify_mismatched_closed_caption_valign1");
+ auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+ dir,
+ {
+ { 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+ { 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+ { 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
+ });
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
});
}
-BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
+BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
{
- path const dir("build/test/verify_mismatched_cpl_annotation_text");
- auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
-
+ auto const dir = path ("build/test/verify_mismatched_closed_caption_valign2");
+ auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+ dir,
+ {
+ { 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+ { 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+ { 96, 300, 0.2, dcp::VAlign::CENTER, "not fine" },
+ });
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
+{
+ auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering1");
+ auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+ dir,
+ {
+ { 96, 300, 0.0, dcp::VAlign::TOP, "This" },
+ { 96, 300, 0.1, dcp::VAlign::TOP, "is" },
+ { 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
+ });
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
+{
+ auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering2");
+ auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
+ dir,
+ {
+ { 96, 300, 0.2, dcp::VAlign::BOTTOM, "This" },
+ { 96, 300, 0.1, dcp::VAlign::BOTTOM, "is" },
+ { 96, 300, 0.0, dcp::VAlign::BOTTOM, "also fine" },
+ });
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
+{
+ auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering3");
+ auto cpl = dcp_with_text_from_file<dcp::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering4)
+{
+ auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering4");
+ auto cpl = dcp_with_text_from_file<dcp::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ });
+}
+
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
+{
+ path const dir("build/test/verify_invalid_sound_frame_rate");
+ prepare_directory (dir);
+
+ 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);
+ auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "de-DE", 24, 96000, boost::none);
+ 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::ContentKind::TRAILER, dcp::Standard::SMPTE);
+ cpl->add (reel);
+ auto dcp = make_shared<dcp::DCP>(dir);
+ dcp->add (cpl);
+ dcp->set_annotation_text("hello");
+ dcp->write_xml();
+
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
+{
+ path const dir("build/test/verify_missing_cpl_annotation_text");
+ auto dcp = make_simple (dir);
+ dcp->write_xml();
+
+ BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
+
+ auto const cpl = dcp->cpls()[0];
+
+ {
+ BOOST_REQUIRE (cpl->file());
+ Editor e(cpl->file().get());
+ e.replace("<AnnotationText>A Test DCP</AnnotationText>", "");
+ }
+
+ check_verify_result (
+ {dir},
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
+{
+ path const dir("build/test/verify_mismatched_cpl_annotation_text");
+ auto dcp = make_simple (dir);
+ dcp->write_xml();
+
BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
auto const cpl = dcp->cpls()[0];
cpl->add (reel);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->set_annotation_text("A Test DCP");
+ dcp->write_xml();
check_verify_result (
{dir},
subs->set_language (dcp::LanguageTag("de-DE"));
subs->set_start_time (dcp::Time());
subs->add (simple_subtitle());
+ add_font(subs);
subs->write (dir / "subs.mxf");
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
auto reel1 = make_shared<dcp::Reel>(
- make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
- make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+ make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
+ make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "1", dcp::MXFMetadata(), "en-US", reel_length), 0)
);
if (add_to_reel1) {
reel1->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
}
- auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
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, "", reel_length), 0),
- make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+ make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "2", reel_length), 0),
+ make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "2", dcp::MXFMetadata(), "en-US", reel_length), 0)
);
if (add_to_reel2) {
reel2->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
}
- auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 24, 24));
reel2->add (markers2);
cpl->add (reel2);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->set_annotation_text("A Test DCP");
+ dcp->write_xml();
return cpl;
}
{ dir },
{
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
});
}
subs->set_language (dcp::LanguageTag("de-DE"));
subs->set_start_time (dcp::Time());
subs->add (simple_subtitle());
+ add_font(subs);
subs->write (dir / "subs.mxf");
auto reel1 = make_shared<dcp::Reel>(
- make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
- make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+ make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
+ make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "1", dcp::MXFMetadata(), "en-US", reel_length), 0)
);
for (int i = 0; i < caps_in_reel1; ++i) {
reel1->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
}
- auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+ auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
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, "", reel_length), 0),
- make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
+ make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "2", reel_length), 0),
+ make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "2", dcp::MXFMetadata(), "en-US", reel_length), 0)
);
for (int i = 0; i < caps_in_reel2; ++i) {
reel2->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
}
- auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+ auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 24, 24));
reel2->add (markers2);
cpl->add (reel2);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->set_annotation_text("A Test DCP");
+ dcp->write_xml();
return cpl;
}
subs->set_language (dcp::LanguageTag("de-DE"));
subs->set_start_time (dcp::Time());
subs->add (simple_subtitle());
+ add_font(subs);
subs->write (dir / "subs.mxf");
auto reel_text = make_shared<T>(subs, dcp::Fraction(24, 1), reel_length, 0);
adjust (reel_text);
cpl->add (reel);
dcp->add (cpl);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->set_annotation_text("A Test DCP");
+ dcp->write_xml();
check_verify_result (
{dir},
{
{ dcp::VerificationNote::Type::BV21_ERROR, code, subs->id() },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
});
}
path const dir("build/test/verify_missing_hash");
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
auto const cpl = dcp->cpls()[0];
+ BOOST_REQUIRE_EQUAL (cpl->reels().size(), 1U);
+ BOOST_REQUIRE (cpl->reels()[0]->main_picture());
+ auto asset_id = cpl->reels()[0]->main_picture()->id();
{
BOOST_REQUIRE (cpl->file());
Editor e(cpl->file().get());
- e.replace("<Hash>addO7je2lZSNQp55qjCWo5DLKFQ=</Hash>", "");
+ e.delete_first_line_containing("<Hash>");
}
check_verify_result (
{dir},
{
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, string("1fab8bb0-cfaf-4225-ad6d-01768bc10470") }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, asset_id }
});
}
{
auto dcp = make_simple (dir);
dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
- auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24, 0);
+ auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24);
for (auto const& i: markers) {
markers_asset->set (i.first, i.second);
}
dcp->cpls()[0]->reels()[0]->add(markers_asset);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result ({dir}, test_notes);
}
auto dcp = make_simple (dir);
auto cpl = dcp->cpls()[0];
cpl->unset_version_number();
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
}
{
path dir = "build/test/verify_missing_extension_metadata1";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
+ BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
auto cpl = dcp->cpls()[0];
{
{
path dir = "build/test/verify_missing_extension_metadata2";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto cpl = dcp->cpls()[0];
{
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata3";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto const cpl = dcp->cpls()[0];
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 75 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 70 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
});
}
{
path dir = "build/test/verify_invalid_extension_metadata1";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto cpl = dcp->cpls()[0];
{
path dir = "build/test/verify_invalid_extension_metadata2";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto cpl = dcp->cpls()[0];
{
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata6";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto const cpl = dcp->cpls()[0];
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 79 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 80 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 74 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 75 },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
});
}
{
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata7";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto const cpl = dcp->cpls()[0];
{
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata8";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto const cpl = dcp->cpls()[0];
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 77 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 81 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 72 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 76 },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
});
}
{
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata9";
auto dcp = make_simple (dir);
- dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::LocalTime().as_string(),
- "A Test DCP"
- );
+ dcp->write_xml();
auto const cpl = dcp->cpls()[0];
check_verify_result (
{dir},
{
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 76 },
- { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 71 },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
});
}
auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
mp->set_key (key);
- auto writer = mp->start_write (dir / "video.mxf", false);
+ auto writer = mp->start_write(dir / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
dcp::ArrayData j2c ("test/data/flat_red.j2c");
for (int i = 0; i < 24; ++i) {
writer->write (j2c.data(), j2c.size());
cpl->set_issuer ("OpenDCP 0.0.25");
cpl->set_creator ("OpenDCP 0.0.25");
cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
- cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/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));
d.add (cpl);
- d.write_xml ("OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
+ d.set_issuer("OpenDCP 0.0.25");
+ d.set_creator("OpenDCP 0.0.25");
+ d.set_issue_date("2012-07-17T04:45:18+00:00");
+ d.set_annotation_text("A Test DCP");
+ d.write_xml(signer);
check_verify_result (
{dir},
dcp::MonoPictureAsset picture (find_file(private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV", "j2c.mxf"));
auto reader = picture.start_read ();
auto frame = reader->get_frame (0);
- verify_j2k (frame, notes);
+ verify_j2k(frame, 0, 24, notes);
BOOST_REQUIRE_EQUAL (notes.size(), 0U);
}
dcp::MonoPictureAsset picture (find_file(private_test / "data" / "sul", "TLR"));
auto reader = picture.start_read ();
auto frame = reader->get_frame (0);
- verify_j2k (frame, notes);
+ verify_j2k(frame, 0, 24, notes);
BOOST_REQUIRE_EQUAL (notes.size(), 0U);
}
dcp::MonoPictureAsset picture (find_file(dir, "video"));
auto reader = picture.start_read ();
auto frame = reader->get_frame (0);
- verify_j2k (frame, notes);
+ verify_j2k(frame, 0, 24, notes);
BOOST_REQUIRE_EQUAL (notes.size(), 0U);
}
auto xml_id = dcp::make_uuid ();
ASDCP::TimedText::MXFWriter writer;
auto subs_mxf = dir / "subs.mxf";
- auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+ auto r = writer.OpenWrite(subs_mxf.string().c_str(), writer_info, descriptor, 4096);
BOOST_REQUIRE (ASDCP_SUCCESS(r));
writer.WriteTimedTextResource (dcp::String::compose(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
"<Id>urn:uuid:%1</Id>"
"<ContentTitleText>Content</ContentTitleText>"
"<AnnotationText>Annotation</AnnotationText>"
- "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+ "<IssueDate>2018-10-02T12:25:14</IssueDate>"
"<ReelNumber>1</ReelNumber>"
"<Language>en-US</Language>"
"<EditRate>25 1</EditRate>"
"<TimeCodeRate>25</TimeCodeRate>"
"<StartTime>00:00:00:00</StartTime>"
+ "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
"<SubtitleList>"
"<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
"<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
auto xml_id = resource_id;
ASDCP::TimedText::MXFWriter writer;
auto subs_mxf = dir / "subs.mxf";
- auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+ auto r = writer.OpenWrite(subs_mxf.string().c_str(), writer_info, descriptor, 4096);
BOOST_REQUIRE (ASDCP_SUCCESS(r));
writer.WriteTimedTextResource (dcp::String::compose(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
"<Id>urn:uuid:%1</Id>"
"<ContentTitleText>Content</ContentTitleText>"
"<AnnotationText>Annotation</AnnotationText>"
"<EditRate>25 1</EditRate>"
"<TimeCodeRate>25</TimeCodeRate>"
"<StartTime>00:00:00:00</StartTime>"
+ "<LoadFont ID=\"font\">urn:uuid:0ce6e0ba-58b9-4344-8929-4d9c959c2d55</LoadFont>"
"<SubtitleList>"
"<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
"<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID },
{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
- { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2018-10-02T12:25:14+02:00"} }
+ });
+}
+
+
+/** Check a DCP with a 3D asset marked as 2D */
+BOOST_AUTO_TEST_CASE (verify_threed_marked_as_twod)
+{
+ check_verify_result (
+ { private_test / "data" / "xm" },
+ {
+ {
+ dcp::VerificationNote::Type::WARNING,
+ dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, boost::filesystem::canonical(find_file(private_test / "data" / "xm", "j2c"))
+ },
+ {
+ dcp::VerificationNote::Type::BV21_ERROR,
+ dcp::VerificationNote::Code::INVALID_STANDARD
+ },
+ });
+
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
+{
+ path dir = "build/test/verify_unexpected_things_in_main_markers";
+ prepare_directory (dir);
+ auto dcp = make_simple (dir, 1, 24);
+ dcp->write_xml();
+
+ {
+ Editor e (find_cpl(dir));
+ e.insert(
+ " <IntrinsicDuration>24</IntrinsicDuration>",
+ "<EntryPoint>0</EntryPoint><Duration>24</Duration>"
+ );
+ }
+
+ dcp::CPL cpl (find_cpl(dir));
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
+{
+ path dir = "build/test/verify_invalid_content_kind";
+ prepare_directory (dir);
+ auto dcp = make_simple (dir, 1, 24);
+ dcp->write_xml();
+
+ {
+ Editor e(find_cpl(dir));
+ e.replace("trailer", "trip");
+ }
+
+ dcp::CPL cpl (find_cpl(dir));
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("trip") }
+ });
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
+{
+ path dir = "build/test/verify_valid_content_kind";
+ prepare_directory (dir);
+ auto dcp = make_simple (dir, 1, 24);
+ dcp->write_xml();
+
+ {
+ Editor e(find_cpl(dir));
+ e.replace("<ContentKind>trailer</ContentKind>", "<ContentKind scope=\"http://bobs.contents/\">trip</ContentKind>");
+ }
+
+ dcp::CPL cpl (find_cpl(dir));
+
+ check_verify_result (
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+ });
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
+{
+ path dir = "build/test/verify_invalid_main_picture_active_area_1";
+ prepare_directory(dir);
+ auto dcp = make_simple(dir, 1, 24);
+ dcp->write_xml();
+
+ auto constexpr area = "<meta:MainPictureActiveArea>";
+
+ {
+ Editor e(find_cpl(dir));
+ e.delete_lines_after(area, 2);
+ e.insert(area, "<meta:Height>4080</meta:Height>");
+ e.insert(area, "<meta:Width>1997</meta:Width>");
+ }
+
+ dcp::PKL pkl(find_pkl(dir));
+ dcp::CPL cpl(find_cpl(dir));
+
+ check_verify_result(
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 1997 is not a multiple of 2", canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 4080 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
+{
+ path dir = "build/test/verify_invalid_main_picture_active_area_2";
+ prepare_directory(dir);
+ auto dcp = make_simple(dir, 1, 24);
+ dcp->write_xml();
+
+ auto constexpr area = "<meta:MainPictureActiveArea>";
+
+ {
+ Editor e(find_cpl(dir));
+ e.delete_lines_after(area, 2);
+ e.insert(area, "<meta:Height>5125</meta:Height>");
+ e.insert(area, "<meta:Width>9900</meta:Width>");
+ }
+
+ dcp::PKL pkl(find_pkl(dir));
+ dcp::CPL cpl(find_cpl(dir));
+
+ check_verify_result(
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is not a multiple of 2", canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 9900 is bigger than the asset width 1998", canonical(find_cpl(dir)) },
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_duplicate_pkl_asset_ids)
+{
+ RNGFixer rg;
+
+ path dir = "build/test/verify_duplicate_pkl_asset_ids";
+ prepare_directory(dir);
+ auto dcp = make_simple(dir, 1, 24);
+ dcp->write_xml();
+
+ {
+ Editor e(find_pkl(dir));
+ e.replace("urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54", "urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab");
+ }
+
+ dcp::PKL pkl(find_pkl(dir));
+
+ check_verify_result(
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl.id(), canonical(find_pkl(dir)) },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids)
+{
+ RNGFixer rg;
+
+ path dir = "build/test/verify_duplicate_assetmap_asset_ids";
+ prepare_directory(dir);
+ auto dcp = make_simple(dir, 1, 24);
+ dcp->write_xml();
+
+ {
+ Editor e(find_asset_map(dir));
+ e.replace("urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54", "urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa");
+ }
+
+ dcp::PKL pkl(find_pkl(dir));
+ dcp::AssetMap asset_map(find_asset_map(dir));
+
+ check_verify_result(
+ { dir },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir)) },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54") },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
+{
+ boost::filesystem::path const path = "build/test/verify_mismatched_sound_channel_counts";
+
+ dcp::MXFMetadata mxf_meta;
+ mxf_meta.company_name = "OpenDCP";
+ mxf_meta.product_name = "OpenDCP";
+ mxf_meta.product_version = "0.0.25";
+
+ auto constexpr sample_rate = 48000;
+ auto constexpr frames = 240;
+
+ boost::filesystem::remove_all(path);
+ boost::filesystem::create_directories(path);
+ auto dcp = make_shared<dcp::DCP>(path);
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+ cpl->set_annotation_text("hello");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R"));
+ cpl->set_main_sound_sample_rate(sample_rate);
+ 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);
+
+ {
+
+ /* Reel with 2 channels of audio */
+
+ auto mp = simple_picture(path, "1", frames, {});
+ auto ms = simple_sound(path, "1", mxf_meta, "en-US", frames, sample_rate, {}, 2);
+
+ auto reel = make_shared<dcp::Reel>(
+ std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+ std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+ );
+
+ auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+ markers->set(dcp::Marker::FFOC, dcp::Time(0, 0, 0, 1, 24));
+ reel->add(markers);
+
+ cpl->add(reel);
+ }
+
+ {
+ /* Reel with 6 channels of audio */
+
+ auto mp = simple_picture(path, "2", frames, {});
+ auto ms = simple_sound(path, "2", mxf_meta, "en-US", frames, sample_rate, {}, 6);
+
+ auto reel = make_shared<dcp::Reel>(
+ std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+ std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+ );
+
+ auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+ markers->set(dcp::Marker::LFOC, dcp::Time(0, 0, 0, frames - 1, 24));
+ reel->add(markers);
+
+ cpl->add(reel);
+ }
+
+ dcp->add(cpl);
+ dcp->set_annotation_text("hello");
+ dcp->write_xml();
+
+ check_verify_result(
+ { path },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2")) },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
+{
+ boost::filesystem::path const path = "build/test/verify_invalid_main_sound_configuration";
+
+ dcp::MXFMetadata mxf_meta;
+ mxf_meta.company_name = "OpenDCP";
+ mxf_meta.product_name = "OpenDCP";
+ mxf_meta.product_version = "0.0.25";
+
+ auto constexpr sample_rate = 48000;
+ auto constexpr frames = 240;
+
+ boost::filesystem::remove_all(path);
+ boost::filesystem::create_directories(path);
+ auto dcp = make_shared<dcp::DCP>(path);
+ auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+ cpl->set_annotation_text("hello");
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R,C,LFE,Ls,Rs"));
+ cpl->set_main_sound_sample_rate(sample_rate);
+ 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 mp = simple_picture(path, "1", frames, {});
+ auto ms = simple_sound(path, "1", mxf_meta, "en-US", frames, sample_rate, {}, 2);
+
+ auto reel = make_shared<dcp::Reel>(
+ std::make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+ std::make_shared<dcp::ReelSoundAsset>(ms, 0)
+ );
+
+ auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames);
+ markers->set(dcp::Marker::FFOC, dcp::Time(0, 0, 0, 1, 24));
+ markers->set(dcp::Marker::LFOC, dcp::Time(0, 0, 9, 23, 24));
+ reel->add(markers);
+
+ cpl->add(reel);
+
+ dcp->add(cpl);
+ dcp->set_annotation_text("hello");
+ dcp->write_xml();
+
+ check_verify_result(
+ { path },
+ {
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION, std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"}, canonical(find_cpl(path)) },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
+{
+ boost::filesystem::path const path = "build/test/verify_invalid_tile_part_size";
+ auto constexpr video_frames = 24;
+ auto constexpr sample_rate = 48000;
+
+ boost::filesystem::remove_all(path);
+ boost::filesystem::create_directories(path);
+
+ auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+ auto picture_writer = mp->start_write(path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+
+ dcp::Size const size(1998, 1080);
+ auto image = make_shared<dcp::OpenJPEGImage>(size);
+ boost::random::mt19937 rng(1);
+ boost::random::uniform_int_distribution<> dist(0, 4095);
+ for (int c = 0; c < 3; ++c) {
+ for (int p = 0; p < (1998 * 1080); ++p) {
+ image->data(c)[p] = dist(rng);
+ }
+ }
+ auto j2c = dcp::compress_j2k(image, 750000000, video_frames, false, false);
+ for (int i = 0; i < 24; ++i) {
+ picture_writer->write(j2c.data(), j2c.size());
+ }
+ picture_writer->finalize();
+
+ auto dcp = make_shared<dcp::DCP>(path);
+ auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+ cpl->set_content_version(
+ dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11", "content-version-label-text")
+ );
+ cpl->set_main_sound_configuration(dcp::MainSoundConfiguration("51/L,R,C,LFE,Ls,Rs"));
+ cpl->set_main_sound_sample_rate(sample_rate);
+ 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 ms = simple_sound(path, "", dcp::MXFMetadata(), "en-US", video_frames, sample_rate, {});
+
+ auto reel = make_shared<dcp::Reel>(
+ make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+ make_shared<dcp::ReelSoundAsset>(ms, 0)
+ );
+
+ cpl->add(reel);
+ dcp->add(cpl);
+ dcp->set_annotation_text("A Test DCP");
+ dcp->write_xml();
+
+ check_verify_result(
+ { path },
+ {
+ dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE).set_frame(0).set_component(0).set_size(1321721),
+ { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(path / "video.mxf") },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_too_many_subtitle_namespaces)
+{
+ boost::filesystem::path const dir = "test/ref/DCP/subtitle_namespace_test";
+ check_verify_result(
+ { dir },
+ {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(find_file(dir, "sub_")) },
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, "fc815694-7977-4a27-a8b3-32b9d4075e4c", canonical(find_file(dir, "cpl_")) },
+ { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, std::string{"315de731-1173-484c-9a35-bdacf5a9d99d"} }
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
+{
+ path const dir("build/test/verify_missing_load_font");
+ prepare_directory (dir);
+ copy_file ("test/data/subs1.xml", dir / "subs.xml");
+ {
+ Editor editor(dir / "subs.xml");
+ editor.delete_first_line_containing("LoadFont");
+ }
+ auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+ auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+ write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+
+ check_verify_result (
+ {dir}, {
+ { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+ dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId")
+ });
+
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_missing_load_font)
+{
+ boost::filesystem::path const dir = "build/test/verify_missing_load_font";
+ prepare_directory(dir);
+ auto dcp = make_simple (dir, 1, 202);
+
+ string const xml =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\">"
+ "<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+ "<ContentTitleText>Content</ContentTitleText>"
+ "<AnnotationText>Annotation</AnnotationText>"
+ "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+ "<ReelNumber>1</ReelNumber>"
+ "<EditRate>24 1</EditRate>"
+ "<TimeCodeRate>24</TimeCodeRate>"
+ "<StartTime>00:00:00:00</StartTime>"
+ "<Language>de-DE</Language>"
+ "<SubtitleList>"
+ "<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+ "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:06:00\" TimeOut=\"00:00:08:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+ "<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+ "</Subtitle>"
+ "</Font>"
+ "</SubtitleList>"
+ "</SubtitleReel>";
+
+ dcp::File xml_file(dir / "subs.xml", "w");
+ BOOST_REQUIRE(xml_file);
+ xml_file.write(xml.c_str(), xml.size(), 1);
+ xml_file.close();
+ auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+ subs->write(dir / "subs.mxf");
+
+ auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);
+ dcp->cpls()[0]->reels()[0]->add(reel_subs);
+ dcp->write_xml();
+
+ check_verify_result (
+ { dir },
+ {
+ dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id())
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_spots_wrong_asset)
+{
+ boost::filesystem::path const dir = "build/test/verify_spots_wrong_asset";
+ boost::filesystem::remove_all(dir);
+
+ auto dcp1 = make_simple(dir / "1");
+ dcp1->write_xml();
+
+ auto const asset_1 = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id();
+
+ auto dcp2 = make_simple(dir / "2");
+ dcp2->write_xml();
+ auto const asset_2 = dcp::MonoPictureAsset(dir / "2" / "video.mxf").id();
+
+ boost::filesystem::remove(dir / "1" / "video.mxf");
+ boost::filesystem::copy_file(dir / "2" / "video.mxf", dir / "1" / "video.mxf");
+
+ check_verify_result(
+ {dir / "1"},
+ {
+ dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_MAP_ID).set_id(asset_1).set_other_id(asset_2)
+ });
+}
+
+
+BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
+{
+ boost::filesystem::path const dir = "build/test/verify_cpl_content_version_label_text_empty";
+ boost::filesystem::remove_all(dir);
+
+ auto dcp = make_simple(dir);
+ BOOST_REQUIRE(dcp->cpls().size() == 1);
+ auto cpl = dcp->cpls()[0];
+ cpl->set_content_version(dcp::ContentVersion(""));
+ dcp->write_xml();
+
+ check_verify_result(
+ {dir},
+ {
+ dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_id(cpl->id())
});
}
projects / libdcp.git / blobdiff