X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftime_calculation_test.cc;h=272d3edfefb951b56ad52039e0813c8a5497f711;hb=4d42109de06a0c6577f7fd76cc5e243dfe178d37;hp=9f91be584b88c2e4b2ff06194329e58514f84a01;hpb=b1a681c63cd892f91c9825a517b741dee9eb2b26;p=dcpomatic.git

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 9f91be584..272d3edfe 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	list<string> notes;
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, doc, film->state_version(), notes));
-	film->set_sequence_video (false);
+	film->set_sequence (false);
 	film->add_content (content);
 
 	shared_ptr<Player> player (new Player (film, film->playlist ()));
@@ -330,6 +330,21 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),  72);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.50)), 144);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 396);
+
+	/* Position 0s, no trim, content rate 29.9978733, DCP rate 30 */
+	content->set_position (DCPTime::from_seconds (0));
+	content->set_trim_start (ContentTime::from_seconds (0));
+	content->set_video_frame_rate (29.9978733);
+	film->set_video_frame_rate (30);
+	player->setup_pieces ();
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	piece = player->_pieces.front ();
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (6400)), 2);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (9600)), 3);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (12800)), 4);
+
 }
 
 /** Test Player::content_video_to_dcp */
@@ -342,7 +357,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	list<string> notes;
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, doc, film->state_version(), notes));
-	film->set_sequence_video (false);
+	film->set_sequence (false);
 	film->add_content (content);
 
 	shared_ptr<Player> player (new Player (film, film->playlist ()));
@@ -519,7 +534,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	list<string> notes;
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, doc, film->state_version(), notes));
 	AudioStreamPtr stream = content->audio_streams().front();
-	film->set_sequence_video (false);
+	film->set_sequence (false);
 	film->add_content (content);
 
 	shared_ptr<Player> player (new Player (film, film->playlist ()));