X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_test.cc;h=96ef8f71881c4963e189c2e542062ed70b9d792e;hb=429094f009920a14353684e83b4628bfac323617;hp=ab39a651043634623bc884ff4f77fb5dcaa3e071;hpb=f9d0bc389d3f36263fb7a3b54d2263878a8ea7fb;p=dcpomatic.git

diff --git a/test/vf_test.cc b/test/vf_test.cc
index ab39a6510..96ef8f718 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -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"
@@ -34,6 +39,7 @@
 
 using std::list;
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -84,11 +90,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,16 +105,17 @@ 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);
+	DCPOMATIC_ASSERT (!wait_for_jobs ());
 	vf->make_dcp ();
-	wait_for_jobs ();
+	DCPOMATIC_ASSERT (!wait_for_jobs ());
 	vf->write_metadata ();
 
 	dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
@@ -141,11 +148,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	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");
+	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 ();
@@ -156,7 +163,7 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	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 = 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);
 	dcp->set_trim_start (ContentTime::from_seconds (1));
 	dcp->set_trim_end (ContentTime::from_seconds (1));
@@ -167,4 +174,73 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	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);
+}
+
+/** Make a OV with video and audio and a VF referencing the OV and adding some more video */
+BOOST_AUTO_TEST_CASE (vf_test4)
+{
+	/* Make the OV */
+	shared_ptr<Film> ov = new_test_film ("vf_test4_ov");
+	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	ov->set_name ("vf_test4_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_test4_vf");
+	vf->set_name ("vf_test4_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 (vf, ov->dir (ov->dcp_name ())));
+	BOOST_REQUIRE (dcp);
+	vf->examine_and_add_content (dcp);
+	wait_for_jobs ();
+	dcp->set_position(DCPTime::from_seconds(10));
+	dcp->set_reference_video (true);
+	dcp->set_reference_audio (true);
+	shared_ptr<Content> more_video = content_factory(vf, "test/data/flat_red.png").front();
+	vf->examine_and_add_content (more_video);
+	DCPOMATIC_ASSERT (!wait_for_jobs ());
+	more_video->set_position (DCPTime ());
+	vf->write_metadata ();
+	vf->make_dcp ();
+	DCPOMATIC_ASSERT (!wait_for_jobs ());
+
+	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 (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());
+	string const sound_id = ov_c.cpls().front()->reels().front()->main_sound()->id();
+	BOOST_REQUIRE (!ov_c.cpls().front()->reels().front()->main_subtitle());
+
+	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 (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());
+	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_sound()->id(), sound_id);
 }