X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fempty_test.cc;h=b186954b3790916098cc0b5a2d88bf6fc444ce67;hb=01cfa8b85b93589476ce3dbff5f9f207ad737abf;hp=9a1f98ed28f4dd4f8bf459aa3fe97121ae70eacb;hpb=8611fc8597605aa51373adb4fc8f0c697b8c7360;p=dcpomatic.git

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 9a1f98ed2..b186954b3 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,41 +18,47 @@
 
 */
 
+
 /** @file  test/empty_test.cc
  *  @brief Test the creation of Empty objects.
  *  @ingroup feature
  */
 
-#include "lib/film.h"
+
 #include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
-#include "lib/video_content.h"
-#include "lib/image_content.h"
+#include "lib/decoder.h"
 #include "lib/empty.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
 #include "lib/player.h"
-#include "lib/decoder.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
+
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using namespace dcpomatic;
 
+
 bool
 has_video (shared_ptr<const Content> content)
 {
         return static_cast<bool>(content->video);
 }
 
+
 BOOST_AUTO_TEST_CASE (empty_test1)
 {
-	shared_ptr<Film> film = new_test_film2 ("empty_test1");
+	auto film = new_test_film2 ("empty_test1");
 	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"));
+	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
+	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
@@ -64,13 +70,13 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	 *     A A A     B
 	 */
 	contentA->video->set_length (3);
-	contentA->set_position (film, DCPTime::from_frames (2, vfr));
+	contentA->set_position (film, DCPTime::from_frames(2, vfr));
 	contentB->video->set_length (1);
-	contentB->set_position (film, DCPTime::from_frames (7, vfr));
+	contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
 	Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 2U);
-	list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
+	auto i = black._periods.begin();
 	BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
 	BOOST_CHECK (i->to ==   DCPTime::from_frames(2, vfr));
 	++i;
@@ -78,13 +84,14 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	BOOST_CHECK (i->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_film2 ("empty_test2");
+	auto film = new_test_film2 ("empty_test2");
 	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"));
+	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
+	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
@@ -116,13 +123,14 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 	BOOST_CHECK (black.done ());
 }
 
+
 /** Test for when the film's playlist is not the same as the one passed into Empty */
 BOOST_AUTO_TEST_CASE (empty_test3)
 {
-	shared_ptr<Film> film = new_test_film2 ("empty_test3");
+	auto film = new_test_film2 ("empty_test3");
 	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"));
+	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
+	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
@@ -138,7 +146,7 @@ BOOST_AUTO_TEST_CASE (empty_test3)
 	contentB->video->set_length (1);
 	contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
-	shared_ptr<Playlist> playlist (new Playlist);
+	auto playlist = make_shared<Playlist>();
 	playlist->add (film, contentB);
 	Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 1U);
@@ -149,3 +157,27 @@ BOOST_AUTO_TEST_CASE (empty_test3)
 	BOOST_CHECK (black.position() == DCPTime::from_frames(0, vfr));
 }
 
+
+BOOST_AUTO_TEST_CASE (empty_test_with_overlapping_content)
+{
+	auto film = new_test_film2 ("empty_test_with_overlapping_content");
+	film->set_sequence (false);
+	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
+	auto contentB = make_shared<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_length (vfr * 3);
+	contentA->set_position (film, DCPTime());
+	contentB->video->set_length (vfr * 1);
+	contentB->set_position (film, DCPTime::from_seconds(1));
+
+	Empty black(film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
+
+	BOOST_REQUIRE (black._periods.empty());
+}
+