X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fsubtitle_language_test.cc;h=6ae0647e9ebfd5328f922beda71efc6ea1527046;hb=6df70fd09ea8dcdef689a9e5611179d57090eb20;hp=28c278c9424ef9715d67286707dc1790ba9ccfa4;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 28c278c94..6ae0647e9 100644
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,16 @@
 
 */
 
+
 /** @file  test/subtitle_language_test.cc
  *  @brief Test that subtitle language information is correctly written to DCPs.
  */
 
 
+#include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
+#include "lib/text_content.h"
 #include "test.h"
 #include <dcp/language_tag.h>
 #include <boost/test/unit_test.hpp>
@@ -33,45 +36,86 @@
 
 using std::string;
 using std::vector;
-using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 {
 	string const name = "subtitle_language_interop_test";
-	shared_ptr<Film> film = new_test_film2 (name);
-	film->examine_and_add_content (content_factory("test/data/frames.srt").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-
-	vector<dcp::LanguageTag> langs;
-	langs.push_back(dcp::LanguageTag("fr-FR"));
-	langs.push_back(dcp::LanguageTag("de-DE"));
-	film->set_subtitle_languages(langs);
-	film->set_interop (true);
+	auto fr = content_factory("test/data/frames.srt");
+	auto film = new_test_film2 (name, fr);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
-
-	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
+	film->set_interop (true);
+	film->set_audio_channels(6);
+
+	make_and_verify_dcp (
+		film,
+		{
+			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()));
 }
 
 
 BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
 {
 	string const name = "subtitle_language_smpte_test";
-	shared_ptr<Film> film = new_test_film2 (name);
-	film->examine_and_add_content (content_factory("test/data/frames.srt").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-
-	vector<dcp::LanguageTag> langs;
-	langs.push_back(dcp::LanguageTag("fr-FR"));
-	langs.push_back(dcp::LanguageTag("de-DE"));
-	film->set_subtitle_languages(langs);
+	auto fr = content_factory("test/data/frames.srt");
+	auto film = new_test_film2 (name, fr);
+
+	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
 	film->set_interop (false);
 
-	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_DURATION,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
+
+	/* 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);
+}
+
 
-	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+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"));
+	}
 }