X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftime_calculation_test.cc;h=ffe77c2b786ec2aa98000a254cecf288fa5a6df2;hb=980336455724bbdb73f3fb3d521e36c71f9345e5;hp=e995a4ed00693a8f7d0e32dec33cfb170553d165;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index e995a4ed0..ffe77c2b7 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/time_calculation_test.cc
  *  @brief Test calculation of timings when frame rates change.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
+
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/video_content.h"
@@ -31,9 +33,13 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using std::string;
+
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using namespace dcpomatic;
+
 
 static string const xml = "<Content>"
 	"<Type>FFmpeg</Type>"
@@ -124,15 +130,16 @@ static string const xml = "<Content>"
 	"<FirstVideo>0</FirstVideo>"
 	"</Content>";
 
+
 BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_time_calculation_test");
+	auto film = new_test_film ("ffmpeg_time_calculation_test");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate (25);
@@ -176,20 +183,21 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 
 }
 
+
 /** Test Player::dcp_to_content_video */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test1");
+	auto film = new_test_film ("player_time_calculation_test1");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	auto player = make_shared<Player>(film);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -197,7 +205,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	shared_ptr<Piece> piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@ -209,7 +217,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -223,7 +231,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -240,7 +248,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.6)), 15);
@@ -252,7 +260,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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);
@@ -269,7 +277,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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);
@@ -288,7 +296,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@ -300,7 +308,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -314,7 +322,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -332,7 +340,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
@@ -344,7 +352,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -358,7 +366,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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.50)),   0);
@@ -372,7 +380,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	content->set_video_frame_rate (29.9978733);
 	film->set_video_frame_rate (30);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	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);
@@ -385,17 +393,17 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 /** Test Player::content_video_to_dcp */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test2");
+	auto film = new_test_film ("player_time_calculation_test2");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	auto player = make_shared<Player>(film);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -403,7 +411,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	shared_ptr<Piece> piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@ -415,7 +423,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -427,7 +435,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -443,7 +451,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
@@ -455,7 +463,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -467,7 +475,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (25);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
@@ -485,7 +493,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@ -497,7 +505,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -509,7 +517,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (24);
 	film->set_video_frame_rate (48);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -526,7 +534,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
 	BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
@@ -538,7 +546,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -550,7 +558,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	content->set_video_frame_rate (48);
 	film->set_video_frame_rate (24);
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	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());
@@ -561,18 +569,18 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 /** Test Player::dcp_to_content_audio */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 {
-	shared_ptr<Film> film = new_test_film ("player_time_calculation_test3");
+	auto film = new_test_film ("player_time_calculation_test3");
 
-	shared_ptr<cxml::Document> doc (new cxml::Document);
+	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
 
 	list<string> notes;
-	shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
-	AudioStreamPtr stream = content->audio->streams().front();
+	auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
+	auto stream = content->audio->streams().front();
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	auto player = make_shared<Player>(film);
 
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (film, DCPTime());
@@ -581,8 +589,8 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	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_REQUIRE_EQUAL (player->_pieces.size(), 1U);
+	auto piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.0)), 144000);
@@ -594,7 +602,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -609,7 +617,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -624,7 +632,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)),  28800);
@@ -637,7 +645,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
@@ -654,7 +662,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
@@ -673,7 +681,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -686,7 +694,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -701,7 +709,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
@@ -719,7 +727,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -732,7 +740,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -747,7 +755,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
@@ -762,7 +770,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -775,7 +783,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -790,7 +798,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
 	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -805,7 +813,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces ();
-	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+	BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
 	piece = player->_pieces.front ();
-	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143L * 48000);
+	BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143LL * 48000);
 }