X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fempty_test.cc;h=428d0f9bb3e75d4c1bb9ac99f92a225068682ade;hb=f61b5b84f0ac2c1ea32e89f897a1b62630e3b2f7;hp=b7dce1ab89ca12c0bfde11701ca094c225079c2e;hpb=baf84885a777378b9ff5c05ef24d6361560822a6;p=dcpomatic.git

diff --git a/test/empty_test.cc b/test/empty_test.cc
index b7dce1ab8..428d0f9bb 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -24,10 +24,19 @@
 #include "lib/video_content.h"
 #include "lib/image_content.h"
 #include "lib/empty.h"
+#include "lib/player.h"
+#include "lib/decoder.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
+
+bool
+has_video (shared_ptr<Piece> piece)
+{
+        return piece->decoder && piece->decoder->video;
+}
 
 BOOST_AUTO_TEST_CASE (empty_test1)
 {
@@ -36,24 +45,68 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	film->set_name ("empty_test1");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_sequence (false);
-	shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
-	shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> contentA (new ImageContent("test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> contentB (new ImageContent("test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	int const vfr = film->video_frame_rate ();
 
 	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentA->video->set_length (3);
-	contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+	contentA->set_position (film, DCPTime::from_frames (2, vfr));
 	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentB->video->set_length (1);
-	contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
+	contentB->set_position (film, DCPTime::from_frames (7, vfr));
 
-	Empty black (film->playlist(), bind(&Content::video, _1));
+	shared_ptr<Player> player (new Player(film, film->playlist()));
+	Empty black (film, player->_pieces, bind(&has_video, _1));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
 	BOOST_CHECK (black._periods.front().from == DCPTime());
-	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(2, film->video_frame_rate()));
-	BOOST_CHECK (black._periods.back().from == DCPTime::from_frames(5, film->video_frame_rate()));
-	BOOST_CHECK (black._periods.back().to == DCPTime::from_frames(7, film->video_frame_rate()));
+	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(2, vfr));
+	BOOST_CHECK (black._periods.back().from == DCPTime::from_frames(5, vfr));
+	BOOST_CHECK (black._periods.back().to == DCPTime::from_frames(7, vfr));
+}
+
+/** Some tests where the first empty period is not at time 0 */
+BOOST_AUTO_TEST_CASE (empty_test2)
+{
+	shared_ptr<Film> film = new_test_film ("empty_test1");
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
+	film->set_name ("empty_test1");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_sequence (false);
+	shared_ptr<ImageContent> contentA (new ImageContent("test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> contentB (new ImageContent("test/data/simple_testcard_640x480.png"));
+
+	film->examine_and_add_content (contentA);
+	film->examine_and_add_content (contentB);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	int const vfr = film->video_frame_rate ();
+
+	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentA->video->set_length (3);
+	contentA->set_position (film, DCPTime(0));
+	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentB->video->set_length (1);
+	contentB->set_position (film, DCPTime::from_frames(7, vfr));
+
+	shared_ptr<Player> player (new Player(film, film->playlist()));
+	Empty black (film, player->_pieces, bind(&has_video, _1));
+	BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+	BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
+	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
+
+	/* position should initially be the start of the first empty period */
+	BOOST_CHECK (black.position() == DCPTime::from_frames(3, vfr));
+
+	/* check that done() works */
+	BOOST_CHECK (!black.done ());
+	black.set_position (DCPTime::from_frames (4, vfr));
+	BOOST_CHECK (!black.done ());
+	black.set_position (DCPTime::from_frames (7, vfr));
+	BOOST_CHECK (black.done ());
 }