X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvf_test.cc;h=ecb461331548dcb71ac1c1a6e4715d16efb422ec;hp=540e8da88f945fbaca2e3c0fcefa6aacaf19ca40;hb=81e40e7b915a55f8e5aa2db34ad809552b1534e3;hpb=f9252005f1d75b9ed6dc2b515c94acfb98e11ed2

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 540e8da88..ecb461331 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,6 +38,7 @@
 #include <dcp/reel_sound_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::string;
@@ -72,12 +75,9 @@ BOOST_AUTO_TEST_CASE (vf_test1)
 	film->examine_and_add_content (other);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	/* 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));
@@ -283,4 +283,89 @@ 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());
+}
+
+/** 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());
 }