X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclosed_caption_test.cc;h=d1cb9c3e31b30069386ddb2ba665617764023d1c;hp=75768eca88a66080ee322c1b07a709c95c0dbffa;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=cbd4450197a083bf58bda510e626f73ba583cb66

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 75768eca8..d1cb9c3e3 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,28 +19,37 @@
 */
 
 #include "lib/film.h"
-#include "lib/caption_content.h"
-#include "lib/text_caption_file_content.h"
+#include "lib/text_content.h"
+#include "lib/string_text_file_content.h"
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
 
 /** Basic test that Interop closed captions are written */
 BOOST_AUTO_TEST_CASE (closed_caption_test1)
 {
-	shared_ptr<Film> film = new_test_film2 ("closed_caption_test1");
-	shared_ptr<TextCaptionFileContent> content (new TextCaptionFileContent (film, "test/data/subrip.srt"));
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs ());
+	Cleanup cl;
 
-	content->only_caption()->set_type (CAPTION_CLOSED);
+	auto content = make_shared<StringTextFileContent>("test/data/subrip.srt");
+	auto film = new_test_film2 ("closed_caption_test1", { content }, &cl);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	content->only_text()->set_type (TextType::CLOSED_CAPTION);
+
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
 
 	/* Just check to see that there's a CCAP in the CPL: this
 	   check could be better!
@@ -49,7 +58,59 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 	dcp::DCP check (film->dir(film->dcp_name()));
 	check.read ();
 
-	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
-	BOOST_REQUIRE (check.cpls().front()->reels().front()->closed_caption());
+	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
+	BOOST_REQUIRE (!check.cpls().front()->reels().front()->closed_captions().empty());
+
+	cl.run ();
+}
+
+/** Test multiple closed captions */
+BOOST_AUTO_TEST_CASE (closed_caption_test2)
+{
+	Cleanup cl;
+	auto content1 = make_shared<StringTextFileContent>("test/data/subrip.srt");
+	auto content2 = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+	auto content3 = make_shared<StringTextFileContent>("test/data/subrip3.srt");
+	auto film = new_test_film2 ("closed_caption_test2", { content1, content2, content3 }, &cl);
+
+	content1->only_text()->set_type (TextType::CLOSED_CAPTION);
+	content1->only_text()->set_dcp_track (DCPTextTrack("First track", dcp::LanguageTag("fr-FR")));
+	content2->only_text()->set_type (TextType::CLOSED_CAPTION);
+	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", dcp::LanguageTag("de-DE")));
+	content3->only_text()->set_type (TextType::CLOSED_CAPTION);
+	content3->only_text()->set_dcp_track (DCPTextTrack("Third track", dcp::LanguageTag("it-IT")));
+
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION,
+			dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+		}
+		);
+
+	dcp::DCP check (film->dir(film->dcp_name()));
+	check.read ();
+
+	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
+	auto ccaps = check.cpls().front()->reels().front()->closed_captions();
+	BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
+
+	auto i = ccaps.begin ();
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "First track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Second track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Third track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");
+
+	cl.run ();
 }