X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_language_test.cc;h=6ae0647e9ebfd5328f922beda71efc6ea1527046;hb=afd18ea6b14373b2078b6d6dbc74c836e6843757;hp=7703a42756ca61686ed22373470f947dc431eafb;hpb=b1e22dff981fb86ae04b12bb5a064e61030793a8;p=dcpomatic.git

diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 7703a4275..6ae0647e9 100644
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -36,7 +36,6 @@
 
 using std::string;
 using std::vector;
-using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
@@ -45,8 +44,9 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 	auto fr = content_factory("test/data/frames.srt");
 	auto film = new_test_film2 (name, fr);
 
-	fr[0]->only_text()->set_language (dcp::LanguageTag("fr-FR"));
+	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
 	film->set_interop (true);
+	film->set_audio_channels(6);
 
 	make_and_verify_dcp (
 		film,
@@ -54,9 +54,13 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 			dcp::VerificationNote::Code::INVALID_STANDARD,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
-		});
+		},
+		false,
+		/* clairmeta raises errors about subtitle spacing/duration */
+		false
+		);
 
-	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+	check_dcp(String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
 }
 
 
@@ -66,7 +70,7 @@ BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
 	auto fr = content_factory("test/data/frames.srt");
 	auto film = new_test_film2 (name, fr);
 
-	fr[0]->only_text()->set_language (dcp::LanguageTag("fr-FR"));
+	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
 	film->set_interop (false);
 
 	make_and_verify_dcp (
@@ -79,6 +83,39 @@ BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
 			dcp::VerificationNote::Code::MISSING_CPL_METADATA
 		});
 
-	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+	/* This test is concerned with the subtitles, so we'll ignore any
+	 * differences in sound between the DCP and the reference to avoid test
+	 * failures for unrelated reasons.
+	 */
+	check_dcp(String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()), true);
+}
+
+
+BOOST_AUTO_TEST_CASE(subtitle_language_in_cpl_test)
+{
+	auto subs = content_factory("test/data/frames.srt")[0];
+	auto video1 = content_factory("test/data/flat_red.png")[0];
+	auto video2 = content_factory("test/data/flat_red.png")[0];
+	auto film = new_test_film2(boost::unit_test::framework::current_test_unit().full_name(), { subs, video1, video2 });
+	video2->set_position(film, dcpomatic::DCPTime::from_seconds(5));
+	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	subs->only_text()->set_language(dcp::LanguageTag("fr"));
+
+	make_and_verify_dcp(
+		film,
+		{
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+		});
+
+	cxml::Document cpl("CompositionPlaylist");
+	cpl.read_file(find_file(film->dir(film->dcp_name()), "cpl_"));
+
+	for (auto reel: cpl.node_child("ReelList")->node_children("Reel")) {
+		auto subtitle = reel->node_child("AssetList")->node_child("MainSubtitle");
+		BOOST_REQUIRE(subtitle);
+		BOOST_CHECK(subtitle->optional_node_child("Language"));
+	}
 }