X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_reel_test.cc;h=4a2021ba96ed136ba45533b733507b6df62d8857;hb=94ab538738526948c5a52ed1222be1e484255541;hp=c910d4aec3f39a105141c8cee8e0bc2713b5f3ba;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index c910d4aec..4a2021ba9 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -67,8 +67,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
 	dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name());
 	dcp.read ();
@@ -116,8 +115,13 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 	auto subs = content_factory("test/data/15s.srt").front();
 	film->examine_and_add_content (subs);
 	BOOST_REQUIRE (!wait_for_jobs());
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+		});
 
 	dcp::DCP dcp ("build/test/subtitle_in_all_reels_test/" + film->dcp_name());
 	dcp.read ();
@@ -153,16 +157,20 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 	film->examine_and_add_content (ccap1);
 	BOOST_REQUIRE (!wait_for_jobs());
 	ccap1->text.front()->set_type (TextType::CLOSED_CAPTION);
-	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", "de-DE"));
+	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", dcp::LanguageTag("de-DE")));
 
 	auto ccap2 = content_factory("test/data/15s.srt").front();
 	film->examine_and_add_content (ccap2);
 	BOOST_REQUIRE (!wait_for_jobs());
 	ccap2->text.front()->set_type (TextType::CLOSED_CAPTION);
-	ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", "en-GB"));
+	ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", dcp::LanguageTag("en-GB")));
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+		});
 
 	dcp::DCP dcp ("build/test/closed_captions_in_all_reels_test/" + film->dcp_name());
 	dcp.read ();
@@ -182,3 +190,42 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 			);
 	}
 }
+
+
+BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries)
+{
+	auto film = new_test_film2 ("subtitles_split_at_reel_boundaries");
+	film->set_interop (true);
+
+	film->set_sequence (false);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
+
+	for (int i = 0; i < 3; ++i) {
+		auto video = content_factory("test/data/flat_red.png").front();
+		film->examine_and_add_content (video);
+		BOOST_REQUIRE (!wait_for_jobs());
+		video->video->set_length (15 * 24);
+		video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i));
+	}
+
+	auto subtitle = content_factory("test/data/45s.srt").front();
+	film->examine_and_add_content (subtitle);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD });
+
+	dcp::DCP dcp (film->dir(film->dcp_name()));
+	dcp.read();
+	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
+	auto cpl = dcp.cpls()[0];
+	BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
+
+	for (auto i: cpl->reels()) {
+		auto reel_sub = i->main_subtitle();
+		BOOST_REQUIRE (reel_sub);
+		auto sub = reel_sub->asset();
+		BOOST_REQUIRE (sub);
+		BOOST_CHECK_EQUAL (sub->subtitles().size(), 1U);
+	}
+}
+