Merge remote-tracking branch 'origin/main' into v2.17.x

[dcpomatic.git] / test / srt_subtitle_test.cc

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 3863ebf9f26a8aad1250f3f5d482f921dd7aeeb3..031749a8c5c38d24d119ccb136154cc626c53924 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -49,15 +49,11 @@ using namespace dcpomatic;
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 {
-       auto film = new_test_film ("srt_subtitle_test");
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-       film->set_name ("frobozz");
-       film->set_audio_channels (6);
-       film->set_interop (false);
        auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       auto film = new_test_film("srt_subtitle_test", { content });
+       film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
+       film->set_name("frobozz");
+       film->set_audio_channels(16);
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
@@ -78,15 +74,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 /** Same again but with a `font' specified */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 {
-       auto film = new_test_film ("srt_subtitle_test2");
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-       film->set_name ("frobozz");
-       film->set_audio_channels (6);
-       film->set_interop (false);
        auto content = make_shared<StringTextFileContent> ("test/data/subrip2.srt");
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       auto film = new_test_film("srt_subtitle_test2", { content });
+       film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
+       film->set_name("frobozz");
+       film->set_audio_channels (6);
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
@@ -99,7 +91,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
                        dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
-               });
+               },
+               true,
+               /* ClairMeta tries to inspect the font file and fails because it isn't one */
+               false
+               );
 
        /* Should be blank video with a subtitle MXF; sound is irrelevant */
        check_dcp("test/data/srt_subtitle_test2", film->dir(film->dcp_name()), true);
@@ -120,7 +116,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
        Cleanup cl;
 
        auto content = make_shared<StringTextFileContent>(TestPaths::private_data() / "Ankoemmling_short.srt");
-       auto film = new_test_film2 ("srt_subtitle_test3", { content }, &cl);
+       auto film = new_test_film("srt_subtitle_test3", { content }, &cl);
 
        film->set_name ("frobozz");
        film->set_interop (true);
@@ -128,6 +124,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
+       content->only_text()->set_language(dcp::LanguageTag("de"));
 
        make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
@@ -140,16 +137,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 /** Build a small DCP with no picture and a single subtitle overlaid onto it */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 {
-       auto film = new_test_film ("srt_subtitle_test4");
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-       film->set_name ("frobozz");
-       film->set_interop (false);
        auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+       auto film = new_test_film("srt_subtitle_test4", { content });
+       film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
+       film->set_name("frobozz");
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
        make_and_verify_dcp (
                film,
                {
@@ -166,16 +159,17 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 /** Check the subtitle XML when there are two subtitle files in the project */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 {
-       auto film = new_test_film ("srt_subtitle_test5");
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-       film->set_name ("frobozz");
+       auto film = new_test_film("srt_subtitle_test5");
+       film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
+       film->set_name("frobozz");
        film->set_interop (true);
        film->set_sequence (false);
+       film->set_audio_channels(6);
        for (auto i = 0; i < 2; ++i) {
                auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
                content->only_text()->set_use (true);
                content->only_text()->set_burn (false);
+               content->only_text()->set_language(dcp::LanguageTag("de"));
                film->examine_and_add_content (content);
                BOOST_REQUIRE (!wait_for_jobs());
                content->set_position (film, DCPTime());
@@ -189,7 +183,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 {
        auto content = make_shared<StringTextFileContent>("test/data/frames.srt");
-       auto film = new_test_film2 ("srt_subtitle_test6", {content});
+       auto film = new_test_film("srt_subtitle_test6", {content});
        film->set_interop (false);
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
@@ -221,7 +215,7 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
        srt.close();
 
        auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_entity.srt");
-       auto film = new_test_film2("srt_subtitle_entity", { content });
+       auto film = new_test_film("srt_subtitle_entity", { content });
        film->set_interop(false);
        content->only_text()->set_use(true);
        content->only_text()->set_burn(false);
@@ -262,7 +256,7 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
        srt.close();
 
        auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_control_code.srt");
-       auto film = new_test_film2("srt_subtitle_control_code", { content });
+       auto film = new_test_film("srt_subtitle_control_code", { content });
        film->set_interop(false);
        content->only_text()->set_use(true);
        content->only_text()->set_burn(false);
@@ -284,8 +278,8 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
 /** Test rendering of a SubRip subtitle */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 {
-       shared_ptr<Film> film = new_test_film ("subrip_render_test");
        shared_ptr<StringTextFile> content (new StringTextFile("test/data/subrip.srt"));
+       shared_ptr<Film> film = new_test_film("subrip_render_test", { content });
        content->examine (shared_ptr<Job> (), true);
        BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));