X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvf_test.cc;h=ecb461331548dcb71ac1c1a6e4715d16efb422ec;hp=539b2b9fad23fbf2fe3bed2c404f4f67601a91a7;hb=81e40e7b915a55f8e5aa2db34ad809552b1534e3;hpb=58dce923b9d438a27ce1cd7e3125370f74d46e3a diff --git a/test/vf_test.cc b/test/vf_test.cc index 539b2b9fa..ecb461331 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -18,12 +18,19 @@ */ +/** @file test/vf_Test.cc + * @brief Various VF-related tests. + * @ingroup specific + */ + #include "lib/film.h" #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" #include "lib/content_factory.h" #include "lib/dcp_content_type.h" #include "lib/video_content.h" +#include "lib/referenced_reel_asset.h" +#include "lib/player.h" #include "test.h" #include #include @@ -31,9 +38,11 @@ #include #include #include +#include using std::list; using std::string; +using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; @@ -41,40 +50,42 @@ using boost::dynamic_pointer_cast; BOOST_AUTO_TEST_CASE (vf_test1) { shared_ptr film = new_test_film ("vf_test1"); - shared_ptr dcp (new DCPContent (film, "test/data/reels_test2")); + film->set_interop (false); + shared_ptr dcp (new DCPContent ("test/data/reels_test2")); film->examine_and_add_content (dcp); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Multi-reel DCP can't be referenced if we are using a single reel for the project */ film->set_reel_type (REELTYPE_SINGLE); - list why_not; - BOOST_CHECK (!dcp->can_reference_video(why_not)); - BOOST_CHECK (!dcp->can_reference_audio(why_not)); - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + string why_not; + BOOST_CHECK (!dcp->can_reference_video(film, why_not)); + BOOST_CHECK (!dcp->can_reference_audio(film, why_not)); + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not)); + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not)); /* Multi-reel DCP can be referenced if we are using by-video-content */ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - BOOST_CHECK (dcp->can_reference_video(why_not)); - BOOST_CHECK (dcp->can_reference_audio(why_not)); - /* (but reels_test2 has no subtitles to reference) */ - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + BOOST_CHECK (dcp->can_reference_video(film, why_not)); + BOOST_CHECK (dcp->can_reference_audio(film, why_not)); + /* (but reels_test2 has no texts to reference) */ + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not)); + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not)); - shared_ptr other (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr other (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (other); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - /* Not possible if there is overlap */ - other->set_position (DCPTime (0)); - BOOST_CHECK (!dcp->can_reference_video(why_not)); - BOOST_CHECK (!dcp->can_reference_audio(why_not)); - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + /* Not possible if there is overlap; we only check video here as that's all test.mp4 has */ + other->set_position (film, DCPTime()); + BOOST_CHECK (!dcp->can_reference_video(film, why_not)); /* This should not be considered an overlap */ - other->set_position (dcp->end ()); - BOOST_CHECK (dcp->can_reference_video(why_not)); - BOOST_CHECK (dcp->can_reference_audio(why_not)); - /* (reels_test2 has no subtitles to reference) */ - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + other->set_position (film, dcp->end(film)); + BOOST_CHECK (dcp->can_reference_video(film, why_not)); + BOOST_CHECK (dcp->can_reference_audio(film, why_not)); + /* (reels_test2 has no texts to reference) */ + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not)); + BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not)); } /** Make a OV with video and audio and a VF referencing the OV and adding subs */ @@ -84,33 +95,32 @@ BOOST_AUTO_TEST_CASE (vf_test2) shared_ptr ov = new_test_film ("vf_test2_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); ov->set_name ("vf_test2_ov"); - shared_ptr video = content_factory (ov, "test/data/flat_red.png").front(); + shared_ptr video = content_factory ("test/data/flat_red.png").front(); ov->examine_and_add_content (video); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 5); - shared_ptr audio = content_factory(ov, "test/data/white.wav").front(); + shared_ptr audio = content_factory ("test/data/white.wav").front(); ov->examine_and_add_content (audio); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); ov->make_dcp (); - wait_for_jobs (); - - std::cout << "incoming vf.\n"; + BOOST_REQUIRE (!wait_for_jobs()); /* Make the VF */ shared_ptr vf = new_test_film ("vf_test2_vf"); vf->set_name ("vf_test2_vf"); vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - shared_ptr dcp (new DCPContent (vf, ov->dir (ov->dcp_name ()))); + shared_ptr dcp (new DCPContent(ov->dir (ov->dcp_name ()))); BOOST_REQUIRE (dcp); vf->examine_and_add_content (dcp); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); dcp->set_reference_video (true); dcp->set_reference_audio (true); - shared_ptr sub = content_factory(vf, "test/data/subrip4.srt").front(); + shared_ptr sub = content_factory("test/data/subrip4.srt").front(); vf->examine_and_add_content (sub); + BOOST_REQUIRE (!wait_for_jobs()); vf->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); vf->write_metadata (); dcp::DCP ov_c (ov->dir (ov->dcp_name ())); @@ -143,31 +153,31 @@ BOOST_AUTO_TEST_CASE (vf_test3) shared_ptr ov = new_test_film ("vf_test3_ov"); ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); ov->set_name ("vf_test3_ov"); - shared_ptr video = content_factory(ov, "test/data/flat_red.png").front(); + shared_ptr video = content_factory("test/data/flat_red.png").front(); ov->examine_and_add_content (video); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (24 * 5); - shared_ptr audio = content_factory(ov, "test/data/white.wav").front(); + shared_ptr audio = content_factory("test/data/white.wav").front(); ov->examine_and_add_content (audio); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); ov->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Make the VF */ shared_ptr vf = new_test_film ("vf_test3_vf"); vf->set_name ("vf_test3_vf"); vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - shared_ptr dcp (new DCPContent (vf, ov->dir (ov->dcp_name ()))); + shared_ptr dcp (new DCPContent(ov->dir(ov->dcp_name()))); BOOST_REQUIRE (dcp); dcp->set_trim_start (ContentTime::from_seconds (1)); dcp->set_trim_end (ContentTime::from_seconds (1)); vf->examine_and_add_content (dcp); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); dcp->set_reference_video (true); dcp->set_reference_audio (true); vf->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); vf->write_metadata (); dcp::DCP vf_c (vf->dir (vf->dcp_name ())); @@ -181,3 +191,181 @@ BOOST_AUTO_TEST_CASE (vf_test3) BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->entry_point(), 24); BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->duration(), 72); } + +/** Make a OV with video and audio and a VF referencing the OV and adding some more video */ +BOOST_AUTO_TEST_CASE (vf_test4) +{ + /* Make the OV */ + shared_ptr ov = new_test_film ("vf_test4_ov"); + ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + ov->set_name ("vf_test4_ov"); + shared_ptr video = content_factory("test/data/flat_red.png").front(); + ov->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (24 * 5); + shared_ptr audio = content_factory("test/data/white.wav").front(); + ov->examine_and_add_content (audio); + BOOST_REQUIRE (!wait_for_jobs()); + ov->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Make the VF */ + shared_ptr vf = new_test_film ("vf_test4_vf"); + vf->set_name ("vf_test4_vf"); + vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + vf->set_sequence (false); + shared_ptr dcp (new DCPContent(ov->dir(ov->dcp_name()))); + BOOST_REQUIRE (dcp); + vf->examine_and_add_content (dcp); + BOOST_REQUIRE (!wait_for_jobs()); + dcp->set_position(vf, DCPTime::from_seconds(10)); + dcp->set_reference_video (true); + dcp->set_reference_audio (true); + shared_ptr more_video = content_factory("test/data/flat_red.png").front(); + vf->examine_and_add_content (more_video); + BOOST_REQUIRE (!wait_for_jobs()); + more_video->set_position (vf, DCPTime()); + vf->write_metadata (); + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + dcp::DCP ov_c (ov->dir (ov->dcp_name ())); + ov_c.read (); + BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1); + BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture()); + string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id(); + BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound()); + string const sound_id = ov_c.cpls().front()->reels().front()->main_sound()->id(); + BOOST_REQUIRE (!ov_c.cpls().front()->reels().front()->main_subtitle()); + + dcp::DCP vf_c (vf->dir (vf->dcp_name ())); + vf_c.read (); + BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2); + BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture()); + BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id); + BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound()); + BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_sound()->id(), sound_id); +} + +/** Test bug #1495 */ +BOOST_AUTO_TEST_CASE (vf_test5) +{ + /* Make the OV */ + shared_ptr ov = new_test_film ("vf_test5_ov"); + 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) { + shared_ptr video = content_factory("test/data/flat_red.png").front(); + ov->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (24 * 10); + } + + BOOST_REQUIRE (!wait_for_jobs()); + ov->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Make the VF */ + shared_ptr vf = new_test_film ("vf_test5_vf"); + vf->set_name ("vf_test5_vf"); + vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + vf->set_sequence (false); + shared_ptr dcp (new DCPContent(ov->dir(ov->dcp_name()))); + BOOST_REQUIRE (dcp); + vf->examine_and_add_content (dcp); + BOOST_REQUIRE (!wait_for_jobs()); + dcp->set_reference_video (true); + dcp->set_reference_audio (true); + dcp->set_trim_end (ContentTime::from_seconds(15)); + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Check that the selected reel assets are right */ + shared_ptr player (new Player(vf, vf->playlist())); + list a = player->get_reel_assets(); + BOOST_REQUIRE_EQUAL (a.size(), 4); + list::const_iterator i = a.begin(); + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(960000), DCPTime(1440000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(960000), DCPTime(1440000))); + ++i; +} + +/** Test bug #1528 */ +BOOST_AUTO_TEST_CASE (vf_test6) +{ + /* Make the OV */ + shared_ptr 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); + shared_ptr video = content_factory("test/data/flat_red.png").front(); + ov->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + video->video->set_length (24 * 10); + ov->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Make the VF */ + shared_ptr vf = new_test_film ("vf_test6_vf"); + vf->set_name ("vf_test6_vf"); + vf->set_dcp_content_type (DCPContentType::from_isdcf_name("TST")); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + vf->set_sequence (false); + shared_ptr dcp (new DCPContent(ov->dir(ov->dcp_name()))); + BOOST_REQUIRE (dcp); + vf->examine_and_add_content (dcp); + BOOST_REQUIRE (!wait_for_jobs()); + dcp->set_reference_video (true); + dcp->set_reference_audio (true); + + shared_ptr sub = content_factory("test/data/15s.srt").front(); + vf->examine_and_add_content (sub); + BOOST_REQUIRE (!wait_for_jobs()); + + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +} + +/** Test bug #1643 (the second part; referring fails if there are gaps) */ +BOOST_AUTO_TEST_CASE (vf_test7) +{ + /* First OV */ + shared_ptr ov1 = new_test_film2 ("vf_test7_ov1"); + ov1->set_video_frame_rate (24); + ov1->examine_and_add_content (content_factory("test/data/flat_red.png").front()); + BOOST_REQUIRE (!wait_for_jobs()); + ov1->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Second OV */ + shared_ptr ov2 = new_test_film2 ("vf_test7_ov2"); + ov2->set_video_frame_rate (24); + ov2->examine_and_add_content (content_factory("test/data/flat_red.png").front()); + BOOST_REQUIRE (!wait_for_jobs()); + ov2->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* VF */ + shared_ptr vf = new_test_film2 ("vf_test7_vf"); + shared_ptr ov1_dcp (new DCPContent(ov1->dir(ov1->dcp_name()))); + vf->examine_and_add_content (ov1_dcp); + shared_ptr ov2_dcp (new DCPContent(ov1->dir(ov1->dcp_name()))); + vf->examine_and_add_content (ov2_dcp); + BOOST_REQUIRE (!wait_for_jobs()); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + ov1_dcp->set_reference_video (true); + ov2_dcp->set_reference_video (true); + ov1_dcp->set_position (vf, DCPTime::from_seconds(1)); + ov2_dcp->set_position (vf, DCPTime::from_seconds(20)); + vf->write_metadata (); + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +}