Split audio; builds.

1 files changed, 48 insertions, 47 deletions

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 272d3edfe..7c8259f97 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/video_content.h"
 #include "lib/player.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -127,19 +128,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate (25);
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video_length() / 25.0));
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video->video_length() / 25.0));
 	/* 25fps content, 24fps DCP; length should be increased */
 	film->set_video_frame_rate (24);
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video_length() / 24.0));
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video->video_length() / 24.0));
 	/* 25fps content, 30fps DCP; length should be decreased */
 	film->set_video_frame_rate (30);
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video_length() / 30.0));
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video->video_length() / 30.0));
 	/* 25fps content, 50fps DCP; length should be the same */
 	film->set_video_frame_rate (50);
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video_length() / 25.0));
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video->video_length() / 25.0));
 	/* 25fps content, 60fps DCP; length should be decreased */
 	film->set_video_frame_rate (60);
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video_length() * (50.0 / 60) / 25.0));
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (content->video->video_length() * (50.0 / 60) / 25.0));
 }
 
 /** Test Player::dcp_to_content_video */
@@ -160,7 +161,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -172,7 +173,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -186,7 +187,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -203,7 +204,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -215,7 +216,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -231,7 +232,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -250,7 +251,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -262,7 +263,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -276,7 +277,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -294,7 +295,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -306,7 +307,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->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -320,7 +321,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->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -334,7 +335,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->set_video_frame_rate (29.9978733);
+	content->video->set_video_frame_rate (29.9978733);
 	film->set_video_frame_rate (30);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -365,7 +366,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -377,7 +378,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -389,7 +390,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -405,7 +406,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -417,7 +418,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -429,7 +430,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -447,7 +448,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -459,7 +460,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -471,7 +472,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -488,7 +489,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -500,7 +501,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->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -512,7 +513,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->set_video_frame_rate (48);
+	content->video->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
@@ -542,7 +543,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -555,7 +556,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -570,7 +571,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -585,7 +586,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -598,7 +599,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -615,7 +616,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -634,7 +635,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -647,7 +648,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -662,7 +663,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -680,7 +681,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	*/
 	content->set_position (DCPTime ());
 	content->set_trim_start (ContentTime ());
-	content->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -693,7 +694,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -708,7 +709,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
@@ -723,7 +724,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -736,7 +737,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -751,7 +752,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
@@ -766,7 +767,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->set_video_frame_rate (24);
+	content->video->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();