Run all tests with lots of encoding threads.

[dcpomatic.git] / test / vf_test.cc

diff --git a/test/vf_test.cc b/test/vf_test.cc
index b36cc65674979342a43823c1e6a9ebeef30d08e8..6fd0a00e8de3c8596355d38d3943ff14f50a71f0 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -45,6 +45,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
 BOOST_AUTO_TEST_CASE (vf_test1)
@@ -74,13 +75,11 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);
        BOOST_REQUIRE (!wait_for_jobs());
+       BOOST_CHECK (!other->audio);
 
-       /* Not possible if there is overlap */
+       /* 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));
-       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 (film, dcp->end(film));
@@ -188,11 +187,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
        BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
-       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point(), 24);
-       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->duration(), 72);
+       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
+       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
-       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);
+       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->entry_point().get_value_or(0), 24);
+       BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->actual_duration(), 72);
 }
 
 /** Make a OV with video and audio and a VF referencing the OV and adding some more video */
@@ -288,7 +287,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        BOOST_REQUIRE (!wait_for_jobs());
 
        /* Check that the selected reel assets are right */
-       shared_ptr<Player> player (new Player(vf, vf->playlist()));
+       shared_ptr<Player> player (new Player(vf));
        list<ReferencedReelAsset> a = player->get_reel_assets();
        BOOST_REQUIRE_EQUAL (a.size(), 4);
        list<ReferencedReelAsset>::const_iterator i = a.begin();
@@ -301,3 +300,74 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(960000), DCPTime(1440000)));
        ++i;
 }
+
+/** Test bug #1528 */
+BOOST_AUTO_TEST_CASE (vf_test6)
+{
+       /* Make the OV */
+       shared_ptr<Film> 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<Content> 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<Film> 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<DCPContent> 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<Content> 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<Film> 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<Film> 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<Film> vf = new_test_film2 ("vf_test7_vf");
+       shared_ptr<DCPContent> ov1_dcp (new DCPContent(ov1->dir(ov1->dcp_name())));
+       vf->examine_and_add_content (ov1_dcp);
+       shared_ptr<DCPContent> 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());
+}