X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=11b6b28b99cbe6875cfcea5fc597c36f10c8281d;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hp=268da347258ec14af59601b2dd229963b91547b2;hpb=507a389e9c5f84ec1d51e7566e38fbf42f658537;p=dcpomatic.git diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index 268da3472..11b6b28b9 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,15 @@ */ + /** @file test/srt_subtitle_test.cc * @brief Test writing DCPs with subtitles from .srt. - * @ingroup specific + * @ingroup feature */ + #include "lib/film.h" -#include "lib/plain_text_file_content.h" +#include "lib/string_text_file_content.h" #include "lib/dcp_content_type.h" #include "lib/font.h" #include "lib/ratio.h" @@ -34,148 +36,175 @@ #include #include + using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; +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) { - shared_ptr film = new_test_film ("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); - shared_ptr content (new PlainTextFileContent (film, "test/data/subrip2.srt")); + auto content = make_shared("test/data/subrip2.srt"); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); + + content->only_text()->set_use (true); + content->only_text()->set_burn (false); + 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 + }); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); - film->make_dcp (); - wait_for_jobs (); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ())); } + /** Same again but with a `font' specified */ BOOST_AUTO_TEST_CASE (srt_subtitle_test2) { - shared_ptr film = new_test_film ("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); - shared_ptr content (new PlainTextFileContent (film, "test/data/subrip2.srt")); + auto content = make_shared ("test/data/subrip2.srt"); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); /* Use test/data/subrip2.srt as if it were a font file */ - content->subtitle->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt"); + content->only_text()->fonts().front()->set_file("test/data/subrip2.srt"); - film->make_dcp (); - 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::MISSING_CPL_METADATA + }); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ())); } + static void check_subtitle_file (shared_ptr film, boost::filesystem::path ref) { /* Find the subtitle file and check it */ - list ignore; - ignore.push_back ("SubtitleID"); - check_xml (subtitle_file(film), ref, ignore); + check_xml (subtitle_file(film), ref, {"SubtitleID"}); } + /** Make another DCP with a longer .srt file */ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) { - shared_ptr film = new_test_film ("srt_subtitle_test3"); + Cleanup cl; + + auto content = make_shared(TestPaths::private_data() / "Ankoemmling_short.srt"); + auto film = new_test_film2 ("srt_subtitle_test3", { content }, &cl); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (true); film->set_audio_channels (6); - shared_ptr content (new PlainTextFileContent (film, private_data / "Ankoemmling_short.srt")); - film->examine_and_add_content (content); - wait_for_jobs (); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); + + make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD}); - film->make_dcp (); - wait_for_jobs (); + check_subtitle_file (film, TestPaths::private_data() / "Ankoemmling_short.xml"); - check_subtitle_file (film, private_data / "Ankoemmling_short.xml"); + cl.run (); } + /** Build a small DCP with no picture and a single subtitle overlaid onto it */ BOOST_AUTO_TEST_CASE (srt_subtitle_test4) { - shared_ptr film = new_test_film ("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); - shared_ptr content (new PlainTextFileContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + auto content = make_shared("test/data/subrip2.srt"); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->examine_and_add_content (content); - wait_for_jobs (); - film->make_dcp (); - wait_for_jobs (); + 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::MISSING_CPL_METADATA + }); /* Should be blank video with MXF subtitles */ check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ())); } + /** Check the subtitle XML when there are two subtitle files in the project */ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) { - shared_ptr film = new_test_film ("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"); film->set_interop (true); film->set_sequence (false); - shared_ptr content (new PlainTextFileContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); - film->examine_and_add_content (content); - film->examine_and_add_content (content); - wait_for_jobs (); - content->set_position (DCPTime (0)); - film->make_dcp (); - wait_for_jobs (); - film->write_metadata (); + for (auto i = 0; i < 2; ++i) { + auto content = make_shared("test/data/subrip2.srt"); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + content->set_position (film, DCPTime()); + } + make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD}); check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ())); } + BOOST_AUTO_TEST_CASE (srt_subtitle_test6) { - shared_ptr film = new_test_film2 ("srt_subtitle_test6"); + auto content = make_shared("test/data/frames.srt"); + auto film = new_test_film2 ("srt_subtitle_test6", {content}); film->set_interop (false); - shared_ptr content (new PlainTextFileContent (film, "test/data/frames.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs ()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); - film->write_metadata (); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); + 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, + dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION, + dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING, + }); check_dcp ("test/data/srt_subtitle_test6", film->dir(film->dcp_name())); } + #if 0 /* XXX: this is disabled; there is some difference in font rendering between the test machine and others. @@ -185,12 +214,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6) BOOST_AUTO_TEST_CASE (srt_subtitle_test4) { shared_ptr film = new_test_film ("subrip_render_test"); - shared_ptr content (new PlainTextFile (film, "test/data/subrip.srt")); + shared_ptr content (new StringTextFile("test/data/subrip.srt")); content->examine (shared_ptr (), true); BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471)); shared_ptr decoder (new SubRipDecoder (content)); - list cts = decoder->get_plain_texts ( + list cts = decoder->get_plain_texts ( ContentTimePeriod ( ContentTime::from_seconds (109), ContentTime::from_seconds (110) ), false