X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_test.cc;h=ac8256be37fa0d9e15a03ced55d88b76f540668e;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=4bfb2ad6e5a7633ecca2616433fc00d51bd4cff2;hpb=fdcce9bdc44b246151ffe1aa6250f456e41d9c3d;p=dcpomatic.git

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 4bfb2ad6e..ac8256be3 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/vf_Test.cc
+ *  @brief Various VF-related tests.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
@@ -84,11 +89,11 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	shared_ptr<Film> 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<Content> video = content_factory (ov, "test/data/flat_red.png");
+	shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png").front();
 	ov->examine_and_add_content (video);
 	wait_for_jobs ();
 	video->video->set_length (24 * 5);
-	shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+	shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
 	ov->examine_and_add_content (audio);
 	wait_for_jobs ();
 	ov->make_dcp ();
@@ -99,13 +104,13 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	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<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+	shared_ptr<DCPContent> dcp (new DCPContent (vf, ov->dir (ov->dcp_name ())));
 	BOOST_REQUIRE (dcp);
 	vf->examine_and_add_content (dcp);
 	wait_for_jobs ();
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
-	shared_ptr<Content> sub = content_factory (vf, "test/data/subrip4.srt");
+	shared_ptr<Content> sub = content_factory(vf, "test/data/subrip4.srt").front();
 	vf->examine_and_add_content (sub);
 	vf->make_dcp ();
 	wait_for_jobs ();
@@ -131,3 +136,51 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->id(), sound_id);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_subtitle());
 }
+
+/** Test creation of a VF using a trimmed OV; the output should have entry point /
+ *  duration altered to effect the trimming.
+ */
+BOOST_AUTO_TEST_CASE (vf_test3)
+{
+	/* Make the OV */
+	shared_ptr<Film> 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<Content> video = content_factory(ov, "test/data/flat_red.png").front();
+	ov->examine_and_add_content (video);
+	wait_for_jobs ();
+	video->video->set_length (24 * 5);
+	shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
+	ov->examine_and_add_content (audio);
+	wait_for_jobs ();
+	ov->make_dcp ();
+	wait_for_jobs ();
+
+	/* Make the VF */
+	shared_ptr<Film> 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<DCPContent> dcp (new DCPContent (vf, 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 ();
+	dcp->set_reference_video (true);
+	dcp->set_reference_audio (true);
+	vf->make_dcp ();
+	wait_for_jobs ();
+	vf->write_metadata ();
+
+	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 (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_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);
+}