X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvf_test.cc;h=b36cc65674979342a43823c1e6a9ebeef30d08e8;hp=5cded6e256d8ca91b6f2f6e5b81aef4331226eee;hb=d5e7b00770b2b3c536f784b650cb980c694e7493;hpb=cbd4450197a083bf58bda510e626f73ba583cb66 diff --git a/test/vf_test.cc b/test/vf_test.cc index 5cded6e25..b36cc6567 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -29,6 +29,8 @@ #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 @@ -36,6 +38,7 @@ #include #include #include +#include using std::list; using std::string; @@ -48,44 +51,44 @@ BOOST_AUTO_TEST_CASE (vf_test1) { shared_ptr film = new_test_film ("vf_test1"); film->set_interop (false); - shared_ptr dcp (new DCPContent (film, "test/data/reels_test2")); + 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); string why_not; - BOOST_CHECK (!dcp->can_reference_video(why_not)); - BOOST_CHECK (!dcp->can_reference_audio(why_not)); - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, 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 captions to reference) */ - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, 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_caption(CAPTION_OPEN, why_not)); - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, why_not)); + other->set_position (film, DCPTime()); + 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)); /* 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 captions to reference) */ - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); - BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, 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 */ @@ -95,32 +98,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 (); + 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); - DCPOMATIC_ASSERT (!wait_for_jobs ()); + BOOST_REQUIRE (!wait_for_jobs()); vf->make_dcp (); - DCPOMATIC_ASSERT (!wait_for_jobs ()); + BOOST_REQUIRE (!wait_for_jobs()); vf->write_metadata (); dcp::DCP ov_c (ov->dir (ov->dcp_name ())); @@ -153,31 +156,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 ())); @@ -199,15 +202,15 @@ BOOST_AUTO_TEST_CASE (vf_test4) 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 (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_test4_vf"); @@ -215,20 +218,20 @@ BOOST_AUTO_TEST_CASE (vf_test4) 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 (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 (); - dcp->set_position(DCPTime::from_seconds(10)); + 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(vf, "test/data/flat_red.png").front(); + shared_ptr more_video = content_factory("test/data/flat_red.png").front(); vf->examine_and_add_content (more_video); - DCPOMATIC_ASSERT (!wait_for_jobs ()); - more_video->set_position (DCPTime ()); + BOOST_REQUIRE (!wait_for_jobs()); + more_video->set_position (vf, DCPTime()); vf->write_metadata (); vf->make_dcp (); - DCPOMATIC_ASSERT (!wait_for_jobs ()); + BOOST_REQUIRE (!wait_for_jobs()); dcp::DCP ov_c (ov->dir (ov->dcp_name ())); ov_c.read (); @@ -249,3 +252,52 @@ BOOST_AUTO_TEST_CASE (vf_test4) 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; +}