X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftime_calculation_test.cc;h=4524242d95b2644dce6500d76c690bc6e5380ea0;hb=970508d98224f0ed6e3b16cd528f49c24d04ff49;hp=92e7b15ec5420cef180905060c7732df7f55e675;hpb=a0614e6e3b566827381121fdb4ee73268281a70d;p=dcpomatic.git

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 92e7b15ec..4524242d9 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -1,25 +1,33 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  test/time_calculation_test.cc
+ *  @brief Test calculation of timings when frame rates change.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/video_content.h"
 #include "lib/player.h"
+#include "lib/audio_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -31,7 +39,7 @@ static string const xml = "<Content>"
 	"<Type>FFmpeg</Type>"
 	"<BurnSubtitles>0</BurnSubtitles>"
 	"<BitsPerPixel>8</BitsPerPixel>"
-	"<Path>/home/c.hetherington/DCP/clapperboard.mp4</Path>"
+	"<Path>test/data/red_24.mp4</Path>"
 	"<Digest>2760e03c7251480f7f02c01a907792673784335</Digest>"
 	"<Position>0</Position>"
 	"<TrimStart>0</TrimStart>"
@@ -40,7 +48,7 @@ static string const xml = "<Content>"
 	"<VideoWidth>1280</VideoWidth>"
 	"<VideoHeight>720</VideoHeight>"
 	"<VideoFrameRate>25</VideoFrameRate>"
-	"<VideoFrameType>0</VideoFrameType>"
+	"<VideoFrameType>2d</VideoFrameType>"
 	"<LeftCrop>0</LeftCrop>"
 	"<RightCrop>0</RightCrop>"
 	"<TopCrop>0</TopCrop>"
@@ -81,6 +89,7 @@ static string const xml = "<Content>"
 	"<Name>und; 2 channels</Name>"
 	"<Id>2</Id>"
 	"<FrameRate>44100</FrameRate>"
+	"<Length>44100</Length>"
 	"<Channels>2</Channels>"
 	"<FirstAudio>0</FirstAudio>"
 	"<Mapping>"
@@ -127,19 +136,44 @@ 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().get(), DCPTime::from_seconds(content->video->length() / 25.0).get());
 	/* 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().get(), DCPTime::from_seconds(content->video->length() / 24.0).get());
 	/* 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().get(), DCPTime::from_seconds(content->video->length() / 30.0).get());
 	/* 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().get(), DCPTime::from_seconds(content->video->length() / 25.0).get());
 	/* 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().get(), DCPTime::from_seconds(content->video->length() * (50.0 / 60) / 25.0).get());
+
+	/* Make the content audio-only */
+	content->video.reset ();
+
+	/* 24fps content, 24fps DCP */
+	film->set_video_frame_rate (24);
+	content->set_video_frame_rate (24);
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(1).get());
+	/* 25fps content, 25fps DCP */
+	film->set_video_frame_rate (25);
+	content->set_video_frame_rate (25);
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(1).get());
+	/* 25fps content, 24fps DCP; length should be increased */
+	film->set_video_frame_rate (24);
+	BOOST_CHECK_SMALL (labs (content->full_length().get() - DCPTime::from_seconds(25.0 / 24).get()), 2L);
+	/* 25fps content, 30fps DCP; length should be decreased */
+	film->set_video_frame_rate (30);
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(25.0 / 30).get());
+	/* 25fps content, 50fps DCP; length should be the same */
+	film->set_video_frame_rate (50);
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(1).get());
+	/* 25fps content, 60fps DCP; length should be decreased */
+	film->set_video_frame_rate (60);
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(50.0 / 60).get());
+
 }
 
 /** Test Player::dcp_to_content_video */
@@ -152,14 +186,14 @@ 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 ()));
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -171,7 +205,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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -185,7 +219,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 (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -202,7 +236,7 @@ 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 (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
@@ -214,7 +248,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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
@@ -224,11 +258,13 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)),   0);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),   0);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  40);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 169);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 168);
 
-	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25 */
+	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25.  Here the trim is in ContentTime,
+	   so it's 1.6s at 24fps.
+	 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.6));
+	content->set_trim_start (ContentTime::from_seconds (1.6));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
@@ -236,9 +272,9 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	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.60)),   0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),  40);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  80);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 209);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),  38);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  78);
+	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 207);
 
 	/* Position 0, no trim, content rate 24, DCP rate 48
 	   Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -247,7 +283,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   content rate = DCP rate case.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
@@ -259,7 +295,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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
@@ -273,7 +309,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 (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
@@ -291,7 +327,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -303,7 +339,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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -317,7 +353,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 (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
@@ -328,6 +364,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 */
@@ -340,87 +391,87 @@ 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 ()));
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	shared_ptr<Piece> piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime ());
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12), DCPTime::from_seconds (0.5));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (3.0));
+	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 (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 36), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 162), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 162).get(), DCPTime::from_seconds(9.75).get());
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 36), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 198), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 198).get(), DCPTime::from_seconds(9.75).get());
 
 	/* Position 0, no trim, content rate 24, DCP rate 25.
 	   Now, for example, a DCPTime position of 3s means 3s at 25fps.  Since we run the video
 	   fast (at 25fps) in this case, this means 75 frames of content video will be used.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime ());
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 15), DCPTime::from_seconds (0.6));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 75), DCPTime::from_seconds (3.0));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 75).get(), DCPTime::from_seconds(3.0).get());
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 40), DCPTime::from_seconds (4.60));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 169), DCPTime::from_seconds (9.76));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 169).get(), DCPTime::from_seconds(9.76).get());
 
-	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25 */
+	/* 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 (DCPTime::from_seconds (1.6));
+	content->set_trim_start (ContentTime::from_seconds (1.6));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.4));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 40), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 80), DCPTime::from_seconds (4.60));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 209), DCPTime::from_seconds (9.76));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.464).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(3.064).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 80).get(), DCPTime::from_seconds(4.664).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 209).get(), DCPTime::from_seconds(9.824).get());
 
 	/* Position 0, no trim, content rate 24, DCP rate 48
 	   Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -429,40 +480,40 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	   content rate = DCP rate case.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime ());
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12), DCPTime::from_seconds (0.5));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (3.0));
+	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 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 36), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 162), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 162).get(), DCPTime::from_seconds(9.75).get());
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 36), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 198), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 198).get(), DCPTime::from_seconds(9.75).get());
 
 	/* Position 0, no trim, content rate 48, DCP rate 24
 	   Now, for example, a DCPTime position of 3s means 3s at 24fps.  Since we run the video
@@ -470,40 +521,40 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime ());
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 24), DCPTime::from_seconds (0.5));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 144), DCPTime::from_seconds (3.0));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 144).get(), DCPTime::from_seconds(3.0).get());
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 324), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 324).get(), DCPTime::from_seconds(9.75).get());
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72), DCPTime::from_seconds (3.00));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 144), DCPTime::from_seconds (4.50));
-	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 396), DCPTime::from_seconds (9.75));
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 144).get(), DCPTime::from_seconds(4.50).get());
+	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 396).get(), DCPTime::from_seconds(9.75).get());
 }
 
 /** Test Player::dcp_to_content_audio */
@@ -516,101 +567,99 @@ 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);
+	AudioStreamPtr stream = content->audio->streams().front();
+	film->set_sequence (false);
 	film->add_content (content);
 
 	shared_ptr<Player> player (new Player (film, film->playlist ()));
 
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	shared_ptr<Piece> piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.5)),  24000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.0)), 144000);
+	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 (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 324000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 324000);
 
 	/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),   0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)), 144000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 396000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)), 144000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 396000);
 
-	/* Position 0, no trim, content video rate 24, DCP video rate 25, both audio rates still 48k.
-	   Now we are resampling the audio so that 48000 content samples become 46080 DCP samples
-	   (sounding the same and still corresponding to 1 second) which are then played over 24/25s
-	   so that they run fast.  Hence 1 second in the DCP uses (25/24) * 48000 content samples.
-	*/
+	/* 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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.6)),  30000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.0)), 150000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)),  28800);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.0)), 144000);
 
 	/* 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 (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.60)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.60)),  80000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 337500);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.60)),  76800);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 324000);
 
-	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, both audio rates still 48k. */
+	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, both audio rates still 48k.
+	   1s of content is 46080 samples after resampling.
+	*/
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.6));
+	content->set_trim_start (ContentTime::from_seconds (1.6));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.60)),   0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  80000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.60)), 160000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 417500);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),  73728);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.60)), 150528);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 397728);
 
 	/* Position 0, no trim, content rate 24, DCP rate 48, both audio rates still 48k.
 	   Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -618,135 +667,144 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	   The results should be the same as the content rate = DCP rate case.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.5)),  24000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.0)), 144000);
+	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, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 324000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 324000);
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),   0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)), 144000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 396000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)), 144000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 396000);
 
 	/* Position 0, no trim, content rate 48, DCP rate 24
 	   Now, for example, a DCPTime position of 3s means 3s at 24fps.  Since we run the video
 	   with skipped frames in this case, audio samples should map straight through.
 	*/
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.5)),  24000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.0)), 144000);
+	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, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 324000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 324000);
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),   0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  72000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)), 144000);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 396000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)), 144000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 396000);
 
-	/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k
-	   Now 44100 content samples correspond to 1s.
-	*/
+	/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position (DCPTime ());
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.5)),  22050);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.0)), 132300);
+	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 content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position (DCPTime::from_seconds (3));
-	content->set_trim_start (DCPTime ());
+	content->set_trim_start (ContentTime ());
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)),  66150);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 297675);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 324000);
 
 	/* 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 (DCPTime::from_seconds (1.5));
+	content->set_trim_start (ContentTime::from_seconds (1.5));
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.50)),      0);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  66150);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.50)), 132300);
-	BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 363825);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.00)),  72000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (4.50)), 144000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (9.75)), 396000);
+
+	/* 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);
+	film->set_video_frame_rate (24);
+	stream->_frame_rate = 48000;
+	player->setup_pieces ();
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	piece = player->_pieces.front ();
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143L * 48000);
 }