Move video frame rate ('prepared-for') into Content.

5 files changed, 77 insertions, 76 deletions

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 9cd123890..ac3064aa0 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -37,8 +37,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-static void
-test (boost::filesystem::path file, float fps, int gaps, int video_length)
+void
+ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length)
 {
 	boost::filesystem::path path = private_data / file;
 	if (!boost::filesystem::exists (path)) {
@@ -53,7 +53,8 @@ test (boost::filesystem::path file, float fps, int gaps, int video_length)
 	shared_ptr<Log> log (new NullLog);
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-	BOOST_CHECK_CLOSE (decoder->video_content()->frame_rate(), fps, 0.01);
+	BOOST_REQUIRE (decoder->_video_content->video_frame_rate());
+	BOOST_CHECK_CLOSE (decoder->_video_content->video_frame_rate().get(), fps, 0.01);
 
 #ifdef DCPOMATIC_DEBUG
 	decoder->test_gaps = 0;
@@ -71,10 +72,10 @@ test (boost::filesystem::path file, float fps, int gaps, int video_length)
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
-	test ("boon_telly.mkv", 29.97, 0, 6910);
-	test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
+	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 0, 6910);
+	ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
 	/* The first video frame is 12 here, so VideoDecoder should see 12 gaps
 	   (at the start of the file)
 	*/
-	test ("prophet_clip.mkv", 23.976, 12, 2875);
+	ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 12, 2875);
 }
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 5b1821dae..db9e751d5 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
 	content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
-	content->video->_frame_rate = 24;
+	content->_video_frame_rate = 24;
 
 	{
 		/* Sound == video so no offset required */
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 35cd5523a..9c2e9ec3f 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (30);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 60;
+	content->_video_frame_rate = 60;
 	int best = film->best_video_frame_rate ();
 	FrameRateChange frc = FrameRateChange (60, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 50;
+	content->_video_frame_rate = 50;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (50, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 48;
+	content->_video_frame_rate = 48;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (48, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 30;
+	content->_video_frame_rate = 30;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (30, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 29.97;
+	content->_video_frame_rate = 29.97;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (29.97, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (25, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 24;
+	content->_video_frame_rate = 24;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (24, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 14.5;
+	content->_video_frame_rate = 14.5;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (14.5, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 15 / 14.5, 0.1);
 
-	content->video->_frame_rate = 12.6;
+	content->_video_frame_rate = 12.6;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12.6, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 25 / 25.2, 0.1);
 
-	content->video->_frame_rate = 12.4;
+	content->_video_frame_rate = 12.4;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12.4, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 25 / 24.8, 0.1);
 
-	content->video->_frame_rate = 12;
+	content->_video_frame_rate = 12;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (60);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 60;
+	content->_video_frame_rate = 60;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (60, best);
 	BOOST_CHECK_EQUAL (best, 60);
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 50;
+	content->_video_frame_rate = 50;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (50, best);
 	BOOST_CHECK_EQUAL (best, 50);
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 48;
+	content->_video_frame_rate = 48;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (48, best);
 	BOOST_CHECK_EQUAL (best, 48);
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (24);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (25, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -234,16 +234,16 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 	afr.push_back (30);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	A->video->_frame_rate = 30;
-	B->video->_frame_rate = 24;
+	A->_video_frame_rate = 30;
+	B->_video_frame_rate = 24;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25);
 
-	A->video->_frame_rate = 24;
-	B->video->_frame_rate = 24;
+	A->_video_frame_rate = 24;
+	B->_video_frame_rate = 24;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
 
-	A->video->_frame_rate = 24;
-	B->video->_frame_rate = 48;
+	A->_video_frame_rate = 24;
+	B->_video_frame_rate = 48;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
 }
 
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 
 	shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0));
 	content->audio->add_stream (stream);
-	content->video->_frame_rate = 24;
+	content->_video_frame_rate = 24;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 48000);
@@ -274,30 +274,30 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	stream->_frame_rate = 80000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 96000);
 
-	content->video->_frame_rate = 23.976;
+	content->_video_frame_rate = 23.976;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
 
-	content->video->_frame_rate = 29.97;
+	content->_video_frame_rate = 29.97;
 	film->set_video_frame_rate (30);
 	BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 
-	content->video->_frame_rate = 14.99;
+	content->_video_frame_rate = 14.99;
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 16000;
 	/* The FrameRateChange within resampled_frame_rate should choose to double-up
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index f05920c26..332c39db9 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 		video_delay = ContentTime ();
 	}
 
-	Frame const first_frame = video_delay.round_up (content->video->frame_rate ()).frames_round (content->video->frame_rate ());
+	Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
 
 	FFmpegDecoder decoder (content, film->log(), false);
 	list<ContentVideo> a = decoder.get_video (first_frame, true);
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 7f13e6c0e..5e5c6211b 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -308,7 +308,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -336,7 +336,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	/* 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->video->set_frame_rate (29.9978733);
+	content->set_video_frame_rate (29.9978733);
 	film->set_video_frame_rate (30);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -367,7 +367,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -379,7 +379,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -391,7 +391,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -407,7 +407,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -419,7 +419,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -431,7 +431,7 @@ 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 (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -449,7 +449,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -461,7 +461,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -473,7 +473,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -502,7 +502,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -514,7 +514,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (48);
+	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -557,7 +557,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -572,7 +572,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -587,7 +587,7 @@ 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 (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -600,7 +600,7 @@ 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 (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -617,7 +617,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	*/
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.6));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -636,7 +636,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -649,7 +649,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -664,7 +664,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -682,7 +682,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -695,7 +695,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -710,7 +710,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -725,7 +725,7 @@ 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 (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -738,7 +738,7 @@ 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 (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime ());
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -753,7 +753,7 @@ 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 (DCPTime::from_seconds (3));
 	content->set_trim_start (ContentTime::from_seconds (1.5));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -768,7 +768,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	/* Check with a large start trim */
 	content->set_position (DCPTime::from_seconds (0));
 	content->set_trim_start (ContentTime::from_seconds (54143));
-	content->video->set_frame_rate (24);
+	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();