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)
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 */
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());
+}