summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-09 09:58:55 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-17 20:13:22 +0100
commit34a929e1fb77e9f91eddad48f9d4ea73d9ec4d3f (patch)
tree93ca56cb6bd5cb4b087ea110f26e906a5a718ca1
parent3034388f30732db8d748da96ee66fcdde0626c52 (diff)
Stop tests failing when libdcp version changes.
-rw-r--r--src/metadata.h5
-rw-r--r--test/cpl_metadata_test.cc4
-rw-r--r--test/test.cc1
3 files changed, 10 insertions, 0 deletions
diff --git a/src/metadata.h b/src/metadata.h
index a8d2f971..b24265f3 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -56,6 +56,11 @@ class MXFMetadata
{
public:
MXFMetadata ();
+ MXFMetadata (std::string company_name_, std::string product_name_, std::string product_version_)
+ : company_name(company_name_)
+ , product_name(product_name_)
+ , product_version(product_version_)
+ {}
void read (ASDCP::WriterInfo const & info);
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 6fef2c74..19b0ef8e 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -267,6 +267,8 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
cpl.set_distributor ("the-distributor");
cpl.set_facility ("the-facility");
cpl.set_luminance (dcp::Luminance(4.5, dcp::Luminance::FOOT_LAMBERT));
+ cpl.set_issuer ("libdcp1.6.4devel");
+ cpl.set_creator ("libdcp1.6.4devel");
dcp::MainSoundConfiguration msc(dcp::SEVEN_POINT_ONE, 16);
msc.set_mapping (0, dcp::LEFT);
@@ -338,6 +340,8 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
dcp::CPL cpl("", dcp::FEATURE);
cpl.set_issue_date ("2020-08-28T13:35:06+02:00");
cpl.set_content_version (dcp::ContentVersion("id", "version"));
+ cpl.set_issuer ("libdcp1.6.4devel");
+ cpl.set_creator ("libdcp1.6.4devel");
dcp::MainSoundConfiguration msc(dcp::SEVEN_POINT_ONE, 16);
msc.set_mapping (0, dcp::LEFT);
diff --git a/test/test.cc b/test/test.cc
index 1d336806..a939f571 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -470,6 +470,7 @@ black_picture_asset (boost::filesystem::path dir, int frames)
BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
+ asset->set_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel"));
boost::filesystem::create_directories (dir);
shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
for (int i = 0; i < frames; ++i) {