X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=f2d6373926749a01226a5aa25d177c572b5c9d07;hb=392d675f5799671abbcf1a9a47820321bcbdcca2;hp=2b7cb340a3aa9aea600b864c1daa1c689752f18c;hpb=a49d1f0a2db7d84ad0d158bf1f6d384ff14ab6a3;p=dcpomatic.git diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index 2b7cb340a..f2d637392 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -24,11 +24,11 @@ */ #include "lib/film.h" -#include "lib/text_subtitle_content.h" +#include "lib/string_text_file_content.h" #include "lib/dcp_content_type.h" #include "lib/font.h" #include "lib/ratio.h" -#include "lib/subtitle_content.h" +#include "lib/text_content.h" #include "test.h" #include #include @@ -47,14 +47,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test) film->set_name ("frobozz"); film->set_audio_channels (6); film->set_interop (false); - shared_ptr content (new TextSubtitleContent (film, "test/data/subrip2.srt")); + shared_ptr content (new StringTextFileContent("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); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ())); @@ -69,17 +69,17 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2) film->set_name ("frobozz"); film->set_audio_channels (6); film->set_interop (false); - shared_ptr content (new TextSubtitleContent (film, "test/data/subrip2.srt")); + shared_ptr content (new StringTextFileContent ("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 (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ())); @@ -89,25 +89,9 @@ static void check_subtitle_file (shared_ptr film, boost::filesystem::path ref) { /* Find the subtitle file and check it */ - for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false)); - i != boost::filesystem::directory_iterator (); - ++i) { - - if (boost::filesystem::is_directory (i->path ())) { - for ( - boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ()); - j != boost::filesystem::directory_iterator (); - ++j) { - - if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) { - list ignore; - ignore.push_back ("SubtitleID"); - check_xml (*j, ref, ignore); - } - } - } - } + list ignore; + ignore.push_back ("SubtitleID"); + check_xml (subtitle_file(film), ref, ignore); } /** Make another DCP with a longer .srt file */ @@ -120,16 +104,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) film->set_name ("frobozz"); film->set_interop (true); film->set_audio_channels (6); - film->set_interop (false); - shared_ptr content (new TextSubtitleContent (film, private_data / "Ankoemmling_short.srt")); + shared_ptr content (new StringTextFileContent(private_data / "Ankoemmling_short.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); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); check_subtitle_file (film, private_data / "Ankoemmling_short.xml"); } @@ -142,13 +125,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (false); - shared_ptr content (new TextSubtitleContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + shared_ptr content (new StringTextFileContent("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 (); + BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with MXF subtitles */ check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ())); @@ -163,15 +146,19 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) film->set_name ("frobozz"); film->set_interop (true); film->set_sequence (false); - shared_ptr content (new TextSubtitleContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); - film->examine_and_add_content (content); + shared_ptr content (new StringTextFileContent("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 (); - content->set_position (DCPTime (0)); + shared_ptr content2 (new StringTextFileContent("test/data/subrip2.srt")); + content2->only_text()->set_use (true); + content2->only_text()->set_burn (false); + film->examine_and_add_content (content2); + BOOST_REQUIRE (!wait_for_jobs()); + content->set_position (film, DCPTime()); + content2->set_position (film, DCPTime()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->write_metadata (); check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ())); @@ -180,10 +167,10 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) BOOST_AUTO_TEST_CASE (srt_subtitle_test6) { shared_ptr film = new_test_film2 ("srt_subtitle_test6"); - film->set_interop (true); - shared_ptr content (new TextSubtitleContent (film, "test/data/frames.srt")); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + film->set_interop (false); + shared_ptr content (new StringTextFileContent("test/data/frames.srt")); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); @@ -202,19 +189,19 @@ 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 TextSubtitleContent (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_text_subtitles ( + list cts = decoder->get_plain_texts ( ContentTimePeriod ( ContentTime::from_seconds (109), ContentTime::from_seconds (110) ), false ); BOOST_CHECK_EQUAL (cts.size(), 1); - PositionImage image = render_subtitles (cts.front().subs, dcp::Size (1998, 1080)); + PositionImage image = render_text (cts.front().subs, dcp::Size (1998, 1080)); write_image (image.image, "build/test/subrip_render_test.png"); check_file ("build/test/subrip_render_test.png", "test/data/subrip_render_test.png"); }