projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
std::shared_ptr
[dcpomatic.git] / test / vf_test.cc
diff --git a/test/vf_test.cc b/test/vf_test.cc
index b82c3c8897c96e5265a39d82c16c699cb17d7dde..9fc02412a62d3e5ba97c50ea498797bb532cb501 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/vf_Test.cc
  *  @brief Various VF-related tests.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -43,8 +43,9 @@
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::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));
@@ -128,8 +127,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        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_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        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());
@@ -138,8 +137,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        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(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
@@ -185,14 +184,14 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 
        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(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        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 */
@@ -235,8 +234,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        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_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        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());
@@ -245,8 +244,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        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_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2U);
        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());
@@ -288,9 +287,9 @@ 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);
+       BOOST_REQUIRE_EQUAL (a.size(), 4U);
        list<ReferencedReelAsset>::const_iterator i = a.begin();
        BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
        ++i;
@@ -336,3 +335,39 @@ BOOST_AUTO_TEST_CASE (vf_test6)
        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());
+}
2.0 development branch of dcpomatic