Generalise SMPTE Bv2.0 limitation to also support SMPTE A.smpte-a

3 files changed, 78 insertions, 9 deletions

diff --git a/test/data b/test/data
-Subproject 4cb08962ba07e99c442cb12091c0347d84d8fd8
+Subproject 0499768c5485c75728182ac235ec1b7f3166691
diff --git a/test/bv20_test.cc b/test/smpte_flavour_test.cc
index 5530a05d0..6a665ac6c 100644
--- a/test/bv20_test.cc
+++ b/test/smpte_flavour_test.cc
@@ -32,13 +32,49 @@ LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
+using std::string;
 
 
 bool
-has_cpl_mca_subdescriptors(shared_ptr<const Film> film)
+has_cpl_text(shared_ptr<const Film> film, string tag)
 {
 	auto cpl = dcp::file_to_string(find_file(film->dir(film->dcp_name()), "cpl_"));
-	return cpl.find("MCASubDescriptors") != std::string::npos;
+	return cpl.find(tag) != std::string::npos;
+}
+
+
+bool
+has_cpl_mca_subdescriptors(shared_ptr<const Film> film)
+{
+	return has_cpl_text(film, "MCASubDescriptors");
+}
+
+
+bool
+has_rating_list(shared_ptr<const Film> film)
+{
+	return has_cpl_text(film, "RatingList");
+}
+
+
+bool
+has_cpl_metadata(shared_ptr<const Film> film)
+{
+	return has_cpl_text(film, "CompositionMetadataAsset");
+}
+
+
+bool
+has_markers(shared_ptr<const Film> film)
+{
+	return has_cpl_text(film, "MainMarkers");
+}
+
+
+bool
+has_bv21_profile(shared_ptr<const Film> film)
+{
+	return has_cpl_text(film, "SMPTE-RDD-52:2020-Bv2.1");
 }
 
 
@@ -67,29 +103,62 @@ has_mxf_mca_subdescriptors(shared_ptr<const Film> film)
 }
 
 
-BOOST_AUTO_TEST_CASE(bv21_extensions_used_when_not_limited)
+BOOST_AUTO_TEST_CASE(bv21_done_right)
 {
 	auto picture = content_factory("test/data/flat_red.png");
 	auto sound = content_factory("test/data/sine_440.wav");
-	auto film = new_test_film2("bv21_extensions_used_when_not_limited", { picture.front(), sound.front() });
+	auto film = new_test_film2("bv21_done_right", { picture.front(), sound.front() });
 
 	make_and_verify_dcp(film);
 
 	BOOST_CHECK(has_cpl_mca_subdescriptors(film));
 	BOOST_CHECK(has_mxf_mca_subdescriptors(film));
+	BOOST_CHECK(has_bv21_profile(film));
+	BOOST_CHECK(has_cpl_metadata(film));
+	BOOST_CHECK(has_markers(film));
 }
 
 
-BOOST_AUTO_TEST_CASE(bv21_extensions_not_used_when_limited)
+BOOST_AUTO_TEST_CASE(bv20_done_right)
 {
 	auto picture = content_factory("test/data/flat_red.png");
 	auto sound = content_factory("test/data/sine_440.wav");
-	auto film = new_test_film2("bv21_extensions_not_used_when_limited", { picture.front(), sound.front () });
-	film->set_limit_to_smpte_bv20(true);
+	auto film = new_test_film2("bv20_done_right", { picture.front(), sound.front () });
+	film->set_smpte_flavour(dcp::SMPTEFlavour::BV20);
 
-	make_and_verify_dcp(film);
+	make_and_verify_dcp(
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA,
+		}, true, false);
+
+	BOOST_CHECK(!has_cpl_mca_subdescriptors(film));
+	BOOST_CHECK(!has_mxf_mca_subdescriptors(film));
+	BOOST_CHECK(!has_bv21_profile(film));
+	BOOST_CHECK(has_cpl_metadata(film));
+	BOOST_CHECK(has_markers(film));
+}
+
+
+BOOST_AUTO_TEST_CASE(a_done_right)
+{
+	auto picture = content_factory("test/data/flat_red.png");
+	auto sound = content_factory("test/data/sine_440.wav");
+	auto film = new_test_film2("a_done_right", { picture.front(), sound.front () });
+	film->set_smpte_flavour(dcp::SMPTEFlavour::A);
+
+	make_and_verify_dcp(
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_FFOC,
+			dcp::VerificationNote::Code::MISSING_LFOC,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+		});
 
 	BOOST_CHECK(!has_cpl_mca_subdescriptors(film));
 	BOOST_CHECK(!has_mxf_mca_subdescriptors(film));
+	BOOST_CHECK(!has_bv21_profile(film));
+	BOOST_CHECK(!has_cpl_metadata(film));
+	BOOST_CHECK(!has_markers(film));
 }
 
diff --git a/test/wscript b/test/wscript
index cd23badc0..040a8e489 100644
--- a/test/wscript
+++ b/test/wscript
@@ -59,7 +59,6 @@ def build(bld):
                  audio_ring_buffers_test.cc
                  burnt_subtitle_test.cc
                  butler_test.cc
-                 bv20_test.cc
                  cinema_sound_processor_test.cc
                  client_server_test.cc
                  closed_caption_test.cc
@@ -145,6 +144,7 @@ def build(bld):
                  silence_padding_test.cc
                  shuffler_test.cc
                  skip_frame_test.cc
+                 smpte_flavour_test.cc
                  socket_test.cc
                  srt_subtitle_test.cc
                  ssa_subtitle_test.cc