X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=1951d53748a8f9b4cfeda161c8b83fb3d0fd6bed;hb=21d5ca8c20193c3e62f4b0ca5033ebe0bc2ea21d;hp=6178c88ac71f2d2eccdb9b4082fe7ff1a17daeb2;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 6178c88ac..1951d5374 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -43,21 +43,21 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
 	film->examine_and_add_content (B);
 	wait_for_jobs ();
-	BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000));
+	BOOST_CHECK_EQUAL (A->full_length().get(), 288000);
 
 	film->set_reel_type (REELTYPE_SINGLE);
 	list<DCPTimePeriod> r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 1);
-	BOOST_CHECK_EQUAL (r.front().from, DCPTime (0));
-	BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000 * 2));
+	BOOST_CHECK_EQUAL (r.front().from.get(), 0);
+	BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2);
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 	r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 2);
-	BOOST_CHECK_EQUAL (r.front().from, DCPTime (0));
-	BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000));
-	BOOST_CHECK_EQUAL (r.back().from, DCPTime (288000));
-	BOOST_CHECK_EQUAL (r.back().to, DCPTime (288000 * 2));
+	BOOST_CHECK_EQUAL (r.front().from.get(), 0);
+	BOOST_CHECK_EQUAL (r.front().to.get(), 288000);
+	BOOST_CHECK_EQUAL (r.back().from.get(), 288000);
+	BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2);
 
 	film->set_j2k_bandwidth (100000000);
 	film->set_reel_type (REELTYPE_BY_LENGTH);
@@ -66,14 +66,14 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 	r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 3);
 	list<DCPTimePeriod>::const_iterator i = r.begin ();
-	BOOST_CHECK_EQUAL (i->from, DCPTime (0));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (60, 24));
+	BOOST_CHECK_EQUAL (i->from.get(), 0);
+	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get());
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (60, 24));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (120, 24));
+	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(60, 24).get());
+	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(120, 24).get());
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (120, 24));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (144, 24));
+	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(120, 24).get());
+	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(144, 24).get());
 }
 
 /** Make a short DCP with multi reels split by video content, then import
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	shared_ptr<Film> film = new_test_film ("reels_test2");
 	film->set_name ("reels_test2");
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
 	{
 		shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_red.png"));
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	shared_ptr<Film> film2 = new_test_film ("reels_test2b");
 	film2->set_name ("reels_test2b");
 	film2->set_container (Ratio::from_id ("185"));
-	film2->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
 	shared_ptr<DCPContent> c (new DCPContent (film2, film->dir (film->dcp_name ())));
@@ -128,14 +128,14 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	list<DCPTimePeriod> r = film2->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 3);
 	list<DCPTimePeriod>::const_iterator i = r.begin ();
-	BOOST_CHECK_EQUAL (i->from, DCPTime (0));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000));
+	BOOST_CHECK_EQUAL (i->from.get(), 0);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
 
 	c->set_reference_video (true);
 	c->set_reference_audio (true);
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 	shared_ptr<Film> film = new_test_film ("reels_test3");
 	film->set_name ("reels_test3");
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
 	shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
@@ -164,17 +164,17 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 	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));
+	BOOST_CHECK_EQUAL (i->from.get(), 0);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
+	BOOST_CHECK_EQUAL (i->to.get(), 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()));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3);
+	BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().ceil(film->video_frame_rate()).get());
 }
 
 /** Check creation of a multi-reel DCP with a single .srt subtitle file;
@@ -185,7 +185,7 @@ 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_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
 	/* 4 piece of 1s-long content */
@@ -204,20 +204,72 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 	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));
+	BOOST_CHECK_EQUAL (i->from.get(), 0);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
 	++i;
-	BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3));
-	BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4));
+	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3);
+	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4);
 
 	film->make_dcp ();
 	wait_for_jobs ();
 
 	check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
 }
+
+BOOST_AUTO_TEST_CASE (reels_test5)
+{
+	shared_ptr<Film> film = new_test_film ("reels_test4");
+	shared_ptr<DCPContent> dcp (new DCPContent (film, "test/data/reels_test4"));
+	film->examine_and_add_content (dcp);
+	wait_for_jobs ();
+
+	dcp->set_position(DCPTime(123));
+
+	{
+		list<DCPTimePeriod> p = dcp->reels ();
+		BOOST_REQUIRE_EQUAL (p.size(), 4);
+		list<DCPTimePeriod>::const_iterator i = p.begin();
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 96000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 96000), DCPTime(123 + 192000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 192000), DCPTime(123 + 288000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 288000), DCPTime(123 + 384000)));
+	}
+
+	{
+		dcp->set_trim_start (ContentTime::from_seconds (0.5));
+		list<DCPTimePeriod> p = dcp->reels ();
+		BOOST_REQUIRE_EQUAL (p.size(), 4);
+		list<DCPTimePeriod>::const_iterator i = p.begin();
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 336000)));
+	}
+
+	{
+		dcp->set_trim_end (ContentTime::from_seconds (0.5));
+		list<DCPTimePeriod> p = dcp->reels ();
+		BOOST_REQUIRE_EQUAL (p.size(), 4);
+		list<DCPTimePeriod>::const_iterator i = p.begin();
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 288000)));
+	}
+
+	{
+		dcp->set_trim_start (ContentTime::from_seconds (1.5));
+		list<DCPTimePeriod> p = dcp->reels ();
+		BOOST_REQUIRE_EQUAL (p.size(), 3);
+		list<DCPTimePeriod>::const_iterator i = p.begin();
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
+		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 192000)));
+	}
+}