X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=bac0bedeccb7b31cd72054c21508f9d703458e30;hb=HEAD;hp=9354628678742c259606a5594f0f9701aaf0cd69;hpb=ce73eaf7875a9a3326afcd839ad85eb95879c160;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 935462867..bac0bedec 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_name ("frobozz");
 	film->set_audio_channels (6);
 	film->set_interop (false);
+	film->set_audio_channels(16);
 	auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -99,10 +100,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
 			dcp::VerificationNote::Code::MISSING_CPL_METADATA
-		});
+		},
+		true,
+		/* ClairMeta tries to inspect the font file and fails because it isn't one */
+		false
+		);
 
-	/* Should be blank video with a subtitle MXF */
-	check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
+	/* Should be blank video with a subtitle MXF; sound is irrelevant */
+	check_dcp("test/data/srt_subtitle_test2", film->dir(film->dcp_name()), true);
 }
 
 
@@ -128,6 +133,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
+	content->only_text()->set_language(dcp::LanguageTag("de"));
 
 	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
@@ -158,8 +164,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 			dcp::VerificationNote::Code::MISSING_CPL_METADATA
 		});
 
-	/* Should be blank video with MXF subtitles */
-	check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
+	/* Should be blank video with MXF subtitles; sound is irrelevant */
+	check_dcp("test/data/xml_subtitle_test", film->dir(film->dcp_name()), true);
 }
 
 
@@ -172,10 +178,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_sequence (false);
+	film->set_audio_channels(6);
 	for (auto i = 0; i < 2; ++i) {
 		auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
 		content->only_text()->set_use (true);
 		content->only_text()->set_burn (false);
+		content->only_text()->set_language(dcp::LanguageTag("de"));
 		film->examine_and_add_content (content);
 		BOOST_REQUIRE (!wait_for_jobs());
 		content->set_position (film, DCPTime());
@@ -203,7 +211,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 		});
 
-	check_dcp ("test/data/srt_subtitle_test6", film->dir(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("test/data/srt_subtitle_test6", film->dir(film->dcp_name()), true);
 }
 
 
@@ -248,6 +260,30 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
 }
 
 
+/** A control code in a .srt file should not make it into the XML */
+BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
+{
+	std::ofstream srt("build/test/srt_subtitle_control_code.srt");
+	srt << "1\n";
+	srt << "00:00:01,000 -> 00:00:10,000\n";
+	srt << "Hello \x0c world\n";
+	srt.close();
+
+	auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_control_code.srt");
+	auto film = new_test_film2("srt_subtitle_control_code", { content });
+	film->set_interop(false);
+	content->only_text()->set_use(true);
+	content->only_text()->set_burn(false);
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+		});
+}
+
+
 #if 0
 /* XXX: this is disabled; there is some difference in font rendering
    between the test machine and others.