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

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index 6e55ee62f..4a2021ba9 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -31,25 +31,25 @@
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_subtitle_asset.h>
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
 
 using std::list;
 using std::string;
-using boost::optional;
 using std::shared_ptr;
+using std::make_shared;
+using boost::optional;
 
 
 /* Check that timings are done correctly for multi-reel DCPs with PNG subs */
 BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("subtitle_reel_test");
+	auto film = new_test_film2 ("subtitle_reel_test");
 	film->set_interop (true);
-	shared_ptr<ImageContent> red_a (new ImageContent("test/data/flat_red.png"));
-	shared_ptr<ImageContent> red_b (new ImageContent("test/data/flat_red.png"));
-	shared_ptr<DCPSubtitleContent> sub_a (new DCPSubtitleContent("test/data/png_subs/subs.xml"));
-	shared_ptr<DCPSubtitleContent> sub_b (new DCPSubtitleContent("test/data/png_subs/subs.xml"));
+	auto red_a = make_shared<ImageContent>("test/data/flat_red.png");
+	auto red_b = make_shared<ImageContent>("test/data/flat_red.png");
+	auto sub_a = make_shared<DCPSubtitleContent>("test/data/png_subs/subs.xml");
+	auto sub_b = make_shared<DCPSubtitleContent>("test/data/png_subs/subs.xml");
 
 	film->examine_and_add_content (red_a);
 	film->examine_and_add_content (red_b);
@@ -65,27 +65,26 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 	red_b->video->set_length (240);
 	sub_b->set_position (film, dcpomatic::DCPTime::from_seconds(10));
 
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	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 ();
 	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
 	shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
 
-	list<shared_ptr<dcp::Reel> > reels = cpl->reels ();
+	auto reels = cpl->reels ();
 	BOOST_REQUIRE_EQUAL (reels.size(), 2U);
-	list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
+	auto i = reels.begin ();
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	shared_ptr<dcp::InteropSubtitleAsset> A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	auto A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (A);
 	++i;
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	shared_ptr<dcp::InteropSubtitleAsset> B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	auto B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (B);
 
 	BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U);
@@ -102,30 +101,35 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
  */
 BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("subtitle_in_all_reels_test");
+	auto film = new_test_film2 ("subtitle_in_all_reels_test");
 	film->set_interop (false);
 	film->set_sequence (false);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	for (int i = 0; i < 3; ++i) {
-		shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
+		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));
 	}
-	shared_ptr<Content> subs = content_factory("test/data/15s.srt").front();
+	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 ();
 	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
-	shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+	auto cpl = dcp.cpls()[0];
 	BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+	for (auto i: cpl->reels()) {
 		BOOST_CHECK (i->main_subtitle());
 	}
 }
@@ -136,44 +140,48 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
  */
 BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("closed_captions_in_all_reels_test");
+	auto film = new_test_film2 ("closed_captions_in_all_reels_test");
 	film->set_interop (false);
 	film->set_sequence (false);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
 	for (int i = 0; i < 3; ++i) {
-		shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
+		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));
 	}
 
-	shared_ptr<Content> ccap1 = content_factory("test/data/15s.srt").front();
+	auto ccap1 = content_factory("test/data/15s.srt").front();
 	film->examine_and_add_content (ccap1);
 	BOOST_REQUIRE (!wait_for_jobs());
-	ccap1->text.front()->set_type (TEXT_CLOSED_CAPTION);
-	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", "de-DE"));
+	ccap1->text.front()->set_type (TextType::CLOSED_CAPTION);
+	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", dcp::LanguageTag("de-DE")));
 
-	shared_ptr<Content> ccap2 = content_factory("test/data/15s.srt").front();
+	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 (TEXT_CLOSED_CAPTION);
-	ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", "en-GB"));
+	ccap2->text.front()->set_type (TextType::CLOSED_CAPTION);
+	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 ();
 	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
-	shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+	auto cpl = dcp.cpls().front();
 	BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+	for (auto i: cpl->reels()) {
 		BOOST_REQUIRE_EQUAL (i->closed_captions().size(), 2U);
-		optional<string> first = i->closed_captions().front()->language();
-		optional<string> second = i->closed_captions().back()->language();
+		auto first = i->closed_captions().front()->language();
+		auto second = i->closed_captions().back()->language();
 		BOOST_REQUIRE (first);
 		BOOST_REQUIRE (second);
 		BOOST_CHECK (
@@ -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);
+	}
+}
+