X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_reel_test.cc;h=4a2021ba96ed136ba45533b733507b6df62d8857;hb=fcba100f0dfd1d4214291abb76f22ebd696c24d4;hp=7a722b460fde61e4427aea7d09ca5901cd484b47;hpb=5728b8095b9522626d61b1c684a9492f759e2870;p=dcpomatic.git diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc index 7a722b460..4a2021ba9 100644 --- a/test/subtitle_reel_test.cc +++ b/test/subtitle_reel_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019 Carl Hetherington + Copyright (C) 2019-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,30 +18,38 @@ */ +#include "lib/content_factory.h" #include "lib/film.h" #include "lib/image_content.h" #include "lib/dcp_subtitle_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" #include "test.h" #include #include #include #include +#include #include #include + using std::list; -using boost::shared_ptr; +using std::string; +using std::shared_ptr; +using std::make_shared; +using boost::optional; + /* Check that timings are done correctly for multi-reel DCPs with PNG subs */ BOOST_AUTO_TEST_CASE (subtitle_reel_test) { - shared_ptr film = new_test_film2 ("subtitle_reel_test"); + auto film = new_test_film2 ("subtitle_reel_test"); film->set_interop (true); - shared_ptr red_a (new ImageContent("test/data/flat_red.png")); - shared_ptr red_b (new ImageContent("test/data/flat_red.png")); - shared_ptr sub_a (new DCPSubtitleContent("test/data/png_subs/subs.xml")); - shared_ptr sub_b (new DCPSubtitleContent("test/data/png_subs/subs.xml")); + auto red_a = make_shared("test/data/flat_red.png"); + auto red_b = make_shared("test/data/flat_red.png"); + auto sub_a = make_shared("test/data/png_subs/subs.xml"); + auto sub_b = make_shared("test/data/png_subs/subs.xml"); film->examine_and_add_content (red_a); film->examine_and_add_content (red_b); @@ -57,32 +65,167 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test) red_b->video->set_length (240); sub_b->set_position (film, dcpomatic::DCPTime::from_seconds(10)); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD}); dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name()); dcp.read (); - BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); shared_ptr cpl = dcp.cpls().front(); - list > reels = cpl->reels (); - BOOST_REQUIRE_EQUAL (reels.size(), 2); - list >::const_iterator i = reels.begin (); + auto reels = cpl->reels (); + BOOST_REQUIRE_EQUAL (reels.size(), 2U); + auto i = reels.begin (); BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr A = boost::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + auto A = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (A); ++i; BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr B = boost::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + auto B = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (B); - BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1); - BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1); + BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U); + BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1U); /* These times should be the same as they are should be offset from the start of the reel */ BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in()); } + + + +/** Check that with a SMPTE DCP if we have subtitles in one reel, all reels have a + * SubtitleAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1. + */ +BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test) +{ + auto film = new_test_film2 ("subtitle_in_all_reels_test"); + film->set_interop (false); + film->set_sequence (false); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + for (int i = 0; i < 3; ++i) { + auto video = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (15 * 24); + video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); + } + auto subs = content_factory("test/data/15s.srt").front(); + film->examine_and_add_content (subs); + 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::INVALID_SUBTITLE_SPACING + }); + + dcp::DCP dcp ("build/test/subtitle_in_all_reels_test/" + film->dcp_name()); + dcp.read (); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); + auto cpl = dcp.cpls()[0]; + BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U); + + for (auto i: cpl->reels()) { + BOOST_CHECK (i->main_subtitle()); + } +} + + +/** Check that with a SMPTE DCP if we have closed captions in one reel, all reels have a + * ClosedCaptionAssets for the same set of tracks (even if they are empty); SMPTE Bv2.1 section 8.3.1. + */ +BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test) +{ + auto film = new_test_film2 ("closed_captions_in_all_reels_test"); + film->set_interop (false); + film->set_sequence (false); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + + for (int i = 0; i < 3; ++i) { + auto video = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (15 * 24); + video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); + } + + auto ccap1 = content_factory("test/data/15s.srt").front(); + film->examine_and_add_content (ccap1); + BOOST_REQUIRE (!wait_for_jobs()); + ccap1->text.front()->set_type (TextType::CLOSED_CAPTION); + ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", dcp::LanguageTag("de-DE"))); + + auto ccap2 = content_factory("test/data/15s.srt").front(); + film->examine_and_add_content (ccap2); + BOOST_REQUIRE (!wait_for_jobs()); + ccap2->text.front()->set_type (TextType::CLOSED_CAPTION); + ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", dcp::LanguageTag("en-GB"))); + + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING + }); + + dcp::DCP dcp ("build/test/closed_captions_in_all_reels_test/" + film->dcp_name()); + dcp.read (); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); + auto cpl = dcp.cpls().front(); + BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U); + + for (auto i: cpl->reels()) { + BOOST_REQUIRE_EQUAL (i->closed_captions().size(), 2U); + auto first = i->closed_captions().front()->language(); + auto second = i->closed_captions().back()->language(); + BOOST_REQUIRE (first); + BOOST_REQUIRE (second); + BOOST_CHECK ( + (*first == "en-GB" && *second == "de-DE") || + (*first == "de-DE" && *second == "en-GB") + ); + } +} + + +BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries) +{ + auto film = new_test_film2 ("subtitles_split_at_reel_boundaries"); + film->set_interop (true); + + film->set_sequence (false); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + + for (int i = 0; i < 3; ++i) { + auto video = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (15 * 24); + video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); + } + + auto subtitle = content_factory("test/data/45s.srt").front(); + film->examine_and_add_content (subtitle); + BOOST_REQUIRE (!wait_for_jobs()); + + make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD }); + + dcp::DCP dcp (film->dir(film->dcp_name())); + dcp.read(); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); + auto cpl = dcp.cpls()[0]; + BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U); + + for (auto i: cpl->reels()) { + auto reel_sub = i->main_subtitle(); + BOOST_REQUIRE (reel_sub); + auto sub = reel_sub->asset(); + BOOST_REQUIRE (sub); + BOOST_CHECK_EQUAL (sub->subtitles().size(), 1U); + } +} +