X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_test.cc;h=249f9c5b043a6967dfb79e2e55e6adbb04b2b5d5;hb=9144a4b6f55d224fdb7ef6a25cc5fdbf9ba2aa74;hp=3389e83be0063104f7d5833827da1b77e79887f4;hpb=66d0338abb8d8393c5e1e8a9c32ca5e57becda9e;p=dcpomatic.git diff --git a/test/vf_test.cc b/test/vf_test.cc index 3389e83be..249f9c5b0 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -28,9 +28,13 @@ #include "lib/content_factory.h" #include "lib/dcp_content.h" #include "lib/dcp_content_type.h" +#include "lib/examine_content_job.h" #include "lib/ffmpeg_content.h" #include "lib/film.h" +#include "lib/job_manager.h" +#include "lib/make_dcp.h" #include "lib/player.h" +#include "lib/text_content.h" #include "lib/referenced_reel_asset.h" #include "lib/video_content.h" #include "test.h" @@ -102,11 +106,11 @@ BOOST_AUTO_TEST_CASE (vf_test2) auto ov = new_test_film ("vf_test2_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name("TST")); ov->set_name ("vf_test2_ov"); - auto video = content_factory("test/data/flat_red.png").front(); + auto video = content_factory("test/data/flat_red.png")[0]; ov->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 5); - auto audio = content_factory("test/data/white.wav").front(); + auto audio = content_factory("test/data/white.wav")[0]; ov->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp (ov); @@ -121,7 +125,7 @@ BOOST_AUTO_TEST_CASE (vf_test2) BOOST_REQUIRE (!wait_for_jobs()); dcp->set_reference_video (true); dcp->set_reference_audio (true); - auto sub = content_factory("test/data/subrip4.srt").front(); + auto sub = content_factory("test/data/subrip4.srt")[0]; vf->examine_and_add_content (sub); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp ( @@ -164,11 +168,11 @@ BOOST_AUTO_TEST_CASE (vf_test3) auto ov = new_test_film ("vf_test3_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); ov->set_name ("vf_test3_ov"); - auto video = content_factory("test/data/flat_red.png").front(); + auto video = content_factory("test/data/flat_red.png")[0]; ov->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 5); - auto audio = content_factory("test/data/white.wav").front(); + auto audio = content_factory("test/data/white.wav")[0]; ov->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp (ov); @@ -180,7 +184,7 @@ BOOST_AUTO_TEST_CASE (vf_test3) vf->set_reel_type (ReelType::BY_VIDEO_CONTENT); auto dcp = make_shared(ov->dir(ov->dcp_name())); BOOST_REQUIRE (dcp); - dcp->set_trim_start (ContentTime::from_seconds (1)); + dcp->set_trim_start(vf, ContentTime::from_seconds (1)); dcp->set_trim_end (ContentTime::from_seconds (1)); vf->examine_and_add_content (dcp); BOOST_REQUIRE (!wait_for_jobs()); @@ -208,11 +212,11 @@ BOOST_AUTO_TEST_CASE (vf_test4) auto ov = new_test_film ("vf_test4_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); ov->set_name ("vf_test4_ov"); - auto video = content_factory("test/data/flat_red.png").front(); + auto video = content_factory("test/data/flat_red.png")[0]; ov->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 5); - auto audio = content_factory("test/data/white.wav").front(); + auto audio = content_factory("test/data/white.wav")[0]; ov->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp (ov); @@ -230,7 +234,7 @@ BOOST_AUTO_TEST_CASE (vf_test4) dcp->set_position(vf, DCPTime::from_seconds(10)); dcp->set_reference_video (true); dcp->set_reference_audio (true); - auto more_video = content_factory("test/data/flat_red.png").front(); + auto more_video = content_factory("test/data/flat_red.png")[0]; vf->examine_and_add_content (more_video); BOOST_REQUIRE (!wait_for_jobs()); more_video->set_position (vf, DCPTime()); @@ -266,7 +270,7 @@ BOOST_AUTO_TEST_CASE (vf_test5) ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); ov->set_reel_type (ReelType::BY_VIDEO_CONTENT); for (int i = 0; i < 3; ++i) { - auto video = content_factory("test/data/flat_red.png").front(); + auto video = content_factory("test/data/flat_red.png")[0]; ov->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 10); @@ -291,8 +295,7 @@ BOOST_AUTO_TEST_CASE (vf_test5) make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}); /* Check that the selected reel assets are right */ - auto player = make_shared(vf, Image::Alignment::COMPACT); - auto a = player->get_reel_assets(); + auto a = get_referenced_reel_assets(vf, vf->playlist()); BOOST_REQUIRE_EQUAL (a.size(), 4U); auto i = a.begin(); BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); @@ -313,7 +316,7 @@ BOOST_AUTO_TEST_CASE (vf_test6) auto ov = new_test_film ("vf_test6_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name("TST")); ov->set_reel_type (ReelType::BY_VIDEO_CONTENT); - auto video = content_factory("test/data/flat_red.png").front(); + auto video = content_factory("test/data/flat_red.png")[0]; ov->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 10); @@ -331,7 +334,7 @@ BOOST_AUTO_TEST_CASE (vf_test6) dcp->set_reference_video (true); dcp->set_reference_audio (true); - auto sub = content_factory("test/data/15s.srt").front(); + auto sub = content_factory("test/data/15s.srt")[0]; vf->examine_and_add_content (sub); BOOST_REQUIRE (!wait_for_jobs()); @@ -349,12 +352,12 @@ BOOST_AUTO_TEST_CASE (vf_test6) BOOST_AUTO_TEST_CASE (vf_test7) { /* First OV */ - auto ov1 = new_test_film2 ("vf_test7_ov1", {content_factory("test/data/flat_red.png").front()}); + auto ov1 = new_test_film2 ("vf_test7_ov1", {content_factory("test/data/flat_red.png")[0]}); ov1->set_video_frame_rate (24); make_and_verify_dcp (ov1); /* Second OV */ - auto ov2 = new_test_film2 ("vf_test7_ov2", {content_factory("test/data/flat_red.png").front()}); + auto ov2 = new_test_film2 ("vf_test7_ov2", {content_factory("test/data/flat_red.png")[0]}); ov2->set_video_frame_rate (24); make_and_verify_dcp (ov2); @@ -378,7 +381,7 @@ BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp) /* Make an OV with 3 reels */ std::vector> ov_content; for (int i = 0; i < 3; ++i) { - auto c = content_factory("test/data/flat_red.png").front(); + auto c = content_factory("test/data/flat_red.png")[0]; c->video->set_length(240); ov_content.push_back(c); } @@ -387,14 +390,83 @@ BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp) make_and_verify_dcp (ov); /* Make a VF with a specific arrangement */ - auto vf_image = content_factory("test/data/flat_red.png").front(); + auto vf_image = content_factory("test/data/flat_red.png")[0]; auto vf_dcp = make_shared(ov->dir(ov->dcp_name())); auto vf = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_vf", { vf_image, vf_dcp }); vf->set_reel_type(ReelType::BY_VIDEO_CONTENT); vf_dcp->set_reference_video(true); vf_dcp->set_reference_audio(true); - vf_dcp->set_trim_start(ContentTime::from_seconds(10)); + vf_dcp->set_trim_start(vf, ContentTime::from_seconds(10)); vf_dcp->set_position(vf, DCPTime::from_seconds(10)); make_and_verify_dcp (vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET }); } + +/** Test bug #2599: unable to reference open subtitles in an OV when creating a VF that adds closed captions */ +BOOST_AUTO_TEST_CASE(test_referencing_ov_with_subs_when_adding_ccaps) +{ + string const name("test_referencing_ov_with_subs_when_adding_ccaps"); + auto subs = content_factory("test/data/15s.srt"); + auto ov = new_test_film2(name + "_ov", subs); + make_and_verify_dcp( + ov, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_CPL_METADATA + }); + + auto ccaps = content_factory("test/data/15s.srt")[0]; + auto ov_dcp = make_shared(ov->dir(ov->dcp_name(false))); + auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps }); + ccaps->text[0]->set_type(TextType::CLOSED_CAPTION); + + string why_not; + BOOST_CHECK(ov_dcp->can_reference_text(vf, TextType::OPEN_SUBTITLE, why_not)); + std::cout << why_not << "\n"; +} + + +BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf) +{ + string const name("test_duplicate_font_id_in_vf"); + auto subs = content_factory("test/data/15s.srt"); + auto ov = new_test_film2(name + "_ov", subs); + make_and_verify_dcp( + ov, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_CPL_METADATA + }); + + auto ccaps = content_factory("test/data/15s.srt")[0]; + auto ov_dcp = make_shared(ov->dir(ov->dcp_name(false))); + auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps }); + ov_dcp->set_reference_audio(true); + ov_dcp->set_reference_video(true); + ov_dcp->text[0]->set_use(true); + ccaps->text[0]->set_type(TextType::CLOSED_CAPTION); + string why_not; + BOOST_CHECK_MESSAGE(ov_dcp->can_reference_text(vf, TextType::OPEN_SUBTITLE, why_not), why_not); + ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true); + vf->write_metadata(); + make_dcp(vf, TranscodeJob::ChangedBehaviour::IGNORE); + BOOST_REQUIRE(!wait_for_jobs()); + + auto vf_dcp = make_shared(vf->dir(vf->dcp_name(false))); + + auto test = new_test_film2(name + "_test", { vf_dcp }); + vf_dcp->add_ov(ov->dir(ov->dcp_name(false))); + JobManager::instance()->add(make_shared(test, vf_dcp)); + BOOST_CHECK(!wait_for_jobs()); + + make_and_verify_dcp( + test, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_CPL_METADATA, + }); +} +