X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftime_calculation_test.cc;h=7ace7f8c235c0eccce88b39eaa80271e1d1ba233;hb=HEAD;hp=8c57a9fdbbb3dfdb4b417ea12eb1bcc813f65231;hpb=8611fc8597605aa51373adb4fc8f0c697b8c7360;p=dcpomatic.git

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 8c57a9fdb..7ace7f8c2 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/time_calculation_test.cc
  *  @brief Test calculation of timings when frame rates change.
  *  @ingroup feature
  */
 
+
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/video_content.h"
@@ -31,11 +33,13 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using std::string;
+
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::string;
 using namespace dcpomatic;
 
+
 static string const xml = "<Content>"
 	"<Type>FFmpeg</Type>"
 	"<BurnSubtitles>0</BurnSubtitles>"
@@ -125,15 +129,16 @@ static string const xml = "<Content>"
 	"<FirstVideo>0</FirstVideo>"
 	"</Content>";
 
+
 BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_time_calculation_test");
+	auto film = new_test_film ("ffmpeg_time_calculation_test");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate (25);
@@ -156,11 +161,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 
 	/* 24fps content, 24fps DCP */
 	film->set_video_frame_rate (24);
-	content->set_video_frame_rate (24);
+	content->set_video_frame_rate(film, 24);
 	BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate (25);
-	content->set_video_frame_rate (25);
+	content->set_video_frame_rate(film, 25);
 	BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
 	/* 25fps content, 24fps DCP; length should be increased */
 	film->set_video_frame_rate (24);
@@ -177,37 +182,38 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 
 }
 
+
 /** Test Player::dcp_to_content_video */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test1");
+	auto film = new_test_film ("player_time_calculation_test1");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player(film));
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
-	shared_ptr<Piece> piece = player->_pieces.front ();
+	auto 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::from_seconds (0.5)), 12);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.0)), 72);
 
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -220,8 +226,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -237,8 +243,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   fast (at 25fps) in this case, this means 75 frames of content video will be used.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -249,8 +255,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -266,8 +272,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   some of these results are not quite what you'd perhaps expect.
 	 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -285,8 +291,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   content rate = DCP rate case.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -297,8 +303,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -311,8 +317,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -329,8 +335,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -341,8 +347,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -355,8 +361,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -369,8 +375,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
 	/* Position 0s, no trim, content rate 29.9978733, DCP rate 30 */
 	content->set_position (film, DCPTime::from_seconds(0));
-	content->set_trim_start (ContentTime::from_seconds (0));
-	content->set_video_frame_rate (29.9978733);
+	content->set_trim_start(film, ContentTime::from_seconds (0));
+	content->set_video_frame_rate(film, 29.9978733);
 	film->set_video_frame_rate (30);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -386,34 +392,34 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 /** Test Player::content_video_to_dcp */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test2");
+	auto film = new_test_film ("player_time_calculation_test2");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player(film));
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
-	shared_ptr<Piece> piece = player->_pieces.front ();
+	auto piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72).get(), DCPTime::from_seconds(3.0).get());
 
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -424,8 +430,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -440,8 +446,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	   fast (at 25fps) in this case, this means 75 frames of content video will be used.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -452,8 +458,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -464,8 +470,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -482,8 +488,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	   content rate = DCP rate case.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -494,8 +500,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -506,8 +512,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -523,8 +529,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -535,8 +541,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -547,8 +553,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (48);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
@@ -562,36 +568,36 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 /** Test Player::dcp_to_content_audio */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test3");
+	auto film = new_test_film ("player_time_calculation_test3");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
-	AudioStreamPtr stream = content->audio->streams().front();
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
+	auto stream = content->audio->streams().front();
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player(film));
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
-	shared_ptr<Piece> piece = player->_pieces.front ();
+	auto piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.0)), 144000);
 
 	/* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (film, DCPTime::from_seconds (3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -605,8 +611,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (film, DCPTime::from_seconds (3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -620,8 +626,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 0, no trim, content video rate 24, DCP video rate 25, both audio rates still 48k */
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -633,8 +639,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, no trim, content video rate 24, DCP rate 25, both audio rates still 48k. */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -650,8 +656,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	   1s of content is 46080 samples after resampling.
 	*/
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -669,8 +675,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	   The results should be the same as the content rate = DCP rate case.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -682,8 +688,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -697,8 +703,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -715,8 +721,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	   with skipped frames in this case, audio samples should map straight through.
 	*/
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -728,8 +734,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -743,8 +749,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -758,8 +764,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position (film, DCPTime());
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -771,8 +777,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime());
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -786,8 +792,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position (film, DCPTime::from_seconds(3));
-	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -801,8 +807,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
 	/* Check with a large start trim */
 	content->set_position (film, DCPTime::from_seconds(0));
-	content->set_trim_start (ContentTime::from_seconds (54143));
-	content->set_video_frame_rate (24);
+	content->set_trim_start(film, ContentTime::from_seconds(54143));
+	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();