From 2ef30cbe66ca819588bf43d892223ed9864c0e9a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 26 Mar 2025 23:59:30 +0100 Subject: Introduce and use dcp::Profile. This replaces the specific flags passed to DCP::write(), is a property of the CPL (where it seems to belong) and allows us to write what I hear is the correct metadata for this mythical Bv2.0 that somebody invented. --- test/cpl_metadata_test.cc | 4 ++-- test/mono_mpeg2_picture_read_test.cc | 2 -- test/ref/cpl_metadata_test1.xml | 2 +- test/ref/cpl_metadata_test2.xml | 2 +- test/ref/cpl_metadata_test3.xml | 2 +- test/ref/cpl_metadata_test4.xml | 2 +- test/ref/cpl_metadata_test5.xml | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc index f3e44f46..2dc6da7d 100644 --- a/test/cpl_metadata_test.cc +++ b/test/cpl_metadata_test.cc @@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1) { RNGFixer fix; - dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE, dcp::Profile::SMPTE_BV20); cpl.set_issue_date ("2020-08-28T13:35:06+02:00"); vector cv = { @@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2) { RNGFixer fix; - dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE, dcp::Profile::SMPTE_BV20); 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"); diff --git a/test/mono_mpeg2_picture_read_test.cc b/test/mono_mpeg2_picture_read_test.cc index f0d4aac0..df7a5aec 100644 --- a/test/mono_mpeg2_picture_read_test.cc +++ b/test/mono_mpeg2_picture_read_test.cc @@ -45,8 +45,6 @@ extern "C" { BOOST_AUTO_TEST_CASE(mpeg_mono_picture_read_test) { dcp::MonoMPEG2PictureAsset asset(private_test / "data" / "mas" / "r2.mxf" ); - std::cout << "frame rate " << asset.frame_rate().numerator << "\n"; - std::cout << "duration " << asset.intrinsic_duration() << "\n"; auto reader = asset.start_read(); diff --git a/test/ref/cpl_metadata_test1.xml b/test/ref/cpl_metadata_test1.xml index 1140c07d..86859c7b 100644 --- a/test/ref/cpl_metadata_test1.xml +++ b/test/ref/cpl_metadata_test1.xml @@ -71,7 +71,7 @@ DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 + SMPTE-RDD-52:2020-Bv2.0 diff --git a/test/ref/cpl_metadata_test2.xml b/test/ref/cpl_metadata_test2.xml index d04d25af..79731518 100644 --- a/test/ref/cpl_metadata_test2.xml +++ b/test/ref/cpl_metadata_test2.xml @@ -47,7 +47,7 @@ DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 + SMPTE-RDD-52:2020-Bv2.0 diff --git a/test/ref/cpl_metadata_test3.xml b/test/ref/cpl_metadata_test3.xml index 38d732a6..265483fe 100644 --- a/test/ref/cpl_metadata_test3.xml +++ b/test/ref/cpl_metadata_test3.xml @@ -46,7 +46,7 @@ DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 + SMPTE-RDD-52:2020-Bv2.0 diff --git a/test/ref/cpl_metadata_test4.xml b/test/ref/cpl_metadata_test4.xml index e4459375..b4984ccc 100644 --- a/test/ref/cpl_metadata_test4.xml +++ b/test/ref/cpl_metadata_test4.xml @@ -47,7 +47,7 @@ DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 + SMPTE-RDD-52:2020-Bv2.0 diff --git a/test/ref/cpl_metadata_test5.xml b/test/ref/cpl_metadata_test5.xml index 55209e53..02757e21 100644 --- a/test/ref/cpl_metadata_test5.xml +++ b/test/ref/cpl_metadata_test5.xml @@ -47,7 +47,7 @@ DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 + SMPTE-RDD-52:2020-Bv2.0 -- cgit v1.2.3