X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsubtitle_font_id_test.cc;h=5bcf454bd2f29942032732d667e9f68c2d1f7668;hp=41bc3a9230b3d58d35c5bdf83c8e3c014ebee67a;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hpb=8b9888ed8247109dc3c09492302e865fa4731460

diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index 41bc3a923..5bcf454bd 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -24,6 +24,7 @@
 #include "lib/film.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
+#include <dcp/smpte_subtitle_asset.h>
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -51,8 +52,8 @@ BOOST_AUTO_TEST_CASE(full_dcp_subtitle_font_id_test)
 
 BOOST_AUTO_TEST_CASE(dcp_subtitle_font_id_test)
 {
-	auto subs = content_factory(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV" / "8b48f6ae-c74b-4b80-b994-a8236bbbad74_sub.mxf").front();
-	auto film = new_test_film2("dcp_subtitle_font_id_test", { subs });
+	auto subs = content_factory(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV" / "8b48f6ae-c74b-4b80-b994-a8236bbbad74_sub.mxf");
+	auto film = new_test_film2("dcp_subtitle_font_id_test", subs);
 
 	auto content = film->content();
 	BOOST_REQUIRE_EQUAL(content.size(), 1U);
@@ -90,3 +91,35 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_smpte_dcp)
 	make_and_verify_dcp(film);
 }
 
+
+BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_mkv)
+{
+	auto subs = content_factory(TestPaths::private_data() / "clapperboard_with_subs.mkv");
+	auto film = new_test_film2("make_dcp_with_subs_from_mkv", subs);
+	subs[0]->text.front()->set_use(true);
+	subs[0]->text.front()->set_language(dcp::LanguageTag("en-US"));
+	make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K });
+}
+
+
+BOOST_AUTO_TEST_CASE(make_dcp_with_subs_without_font_tag)
+{
+	auto subs = content_factory("test/data/no_font.xml");
+	auto film = new_test_film2("make_dcp_with_subs_without_font_tag", { subs });
+	subs[0]->text.front()->set_use(true);
+	make_and_verify_dcp(
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
+
+	auto check_file = subtitle_file(film);
+	dcp::SMPTESubtitleAsset check_asset(check_file);
+	BOOST_CHECK_EQUAL(check_asset.load_font_nodes().size(), 1U);
+	auto check_font_data = check_asset.font_data();
+	BOOST_CHECK_EQUAL(check_font_data.size(), 1U);
+	BOOST_CHECK(check_font_data.begin()->second == dcp::ArrayData(default_font_file()));
+}
+