Subtitle language handling tweaks; write multiple subtitle languages

to SMPTE extended metadata.

3 files changed, 78 insertions, 0 deletions

diff --git a/test/data b/test/data
-Subproject eebc165cf7df4af980e918bc3176d93521f5bee
+Subproject fddd3fd75d21d858d203ea615387ba3b668c9ae
diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
new file mode 100644
index 000000000..50efb71a1
--- /dev/null
+++ b/test/subtitle_language_test.cc
@@ -0,0 +1,77 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+/** @file  test/subtitle_language_test.cc
+ *  @brief Test that subtitle language information is correctly written to DCPs.
+ */
+
+
+#include "lib/content_factory.h"
+#include "lib/film.h"
+#include "test.h"
+#include <dcp/language_tag.h>
+#include <boost/test/unit_test.hpp>
+#include <vector>
+
+
+using std::string;
+using std::vector;
+using boost::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);
+
+	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()));
+}
+
+
+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);
+	film->set_interop (false);
+
+	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()));
+}
+
diff --git a/test/wscript b/test/wscript
index 9a3347be3..c9e9f2188 100644
--- a/test/wscript
+++ b/test/wscript
@@ -118,6 +118,7 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_charset_test.cc
+                 subtitle_language_test.cc
                  subtitle_metadata_test.cc
                  subtitle_reel_test.cc
                  subtitle_reel_number_test.cc