X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fvf_test.cc;h=307d26ea61824f41d24402aed302c579963e1e53;hb=e153d7f5dc128d97160e41bdda3c4e4a05c7140b;hp=540e8da88f945fbaca2e3c0fcefa6aacaf19ca40;hpb=f9252005f1d75b9ed6dc2b515c94acfb98e11ed2;p=dcpomatic.git

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 540e8da88..307d26ea6 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     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 <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -36,12 +38,14 @@
 #include <dcp/reel_sound_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 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)
@@ -185,11 +189,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 */
@@ -283,4 +287,53 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	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> player (new Player(vf, vf->playlist()));
+	list<ReferencedReelAsset> a = player->get_reel_assets();
+	BOOST_REQUIRE_EQUAL (a.size(), 4);
+	list<ReferencedReelAsset>::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<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());
 }