X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=223391fadfa107882c06cf97d119db3ae5242a71;hb=4d42109de06a0c6577f7fd76cc5e243dfe178d37;hp=3866c50bc5269f17dacf2609dc332a6d63b4a49a;hpb=b5362c8fe1244506e05d18c93026150886171b8f;p=dcpomatic.git

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 3866c50bc..223391fad 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -23,7 +23,7 @@
 #include "lib/image_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
@@ -155,12 +155,49 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 
 	shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
 	film->examine_and_add_content (dcp);
-	shared_ptr<Content> sub (new SubRipContent (film, "test/data/subrip.srt"));
+	shared_ptr<Content> sub (new TextSubtitleContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (sub);
 	wait_for_jobs ();
 
-	std::cout << dcp->position() << " " << dcp->full_length() << "\n";
-	std::cout << sub->position() << " " << sub->full_length() << "\n";
+	list<DCPTimePeriod> reels = film->reels();
+	BOOST_REQUIRE_EQUAL (reels.size(), 4);
+	list<DCPTimePeriod>::const_iterator i = reels.begin ();
+	BOOST_CHECK_EQUAL (i->from, DCPTime (0));
+	BOOST_CHECK_EQUAL (i->to, DCPTime (96000));
+	++i;
+	BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
+	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+	++i;
+	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
+	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+	++i;
+	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3));
+	BOOST_CHECK_EQUAL (i->to, sub->full_length().round_up (film->video_frame_rate()));
+}
+
+/** Check creation of a multi-reel DCP with a single .srt subtitle file;
+ *  make sure that the reel subtitle timing is done right.
+ */
+BOOST_AUTO_TEST_CASE (reels_test4)
+{
+	shared_ptr<Film> film = new_test_film ("reels_test4");
+	film->set_name ("reels_test4");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+
+	/* 4 piece of 1s-long content */
+	shared_ptr<ImageContent> content[4];
+	for (int i = 0; i < 4; ++i) {
+		content[i].reset (new ImageContent (film, "test/data/flat_green.png"));
+		film->examine_and_add_content (content[i]);
+		wait_for_jobs ();
+		content[i]->set_video_length (24);
+	}
+
+	shared_ptr<TextSubtitleContent> subs (new TextSubtitleContent (film, "test/data/subrip3.srt"));
+	film->examine_and_add_content (subs);
+	wait_for_jobs ();
 
 	list<DCPTimePeriod> reels = film->reels();
 	BOOST_REQUIRE_EQUAL (reels.size(), 4);
@@ -175,5 +212,10 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
 	++i;
 	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3));
-	BOOST_CHECK_EQUAL (i->to, sub->full_length());
+	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4));
+
+	film->make_dcp ();
+	wait_for_jobs ();
+
+	check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
 }