X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftime_calculation_test.cc;h=4ab5d0942923e55733cabc5045dfc7fcd7fcf949;hb=8f955150ff2b642109552dd234089f9a038bb3d6;hp=dbcf2677becd4195296f135af82a7dc0ee728a0d;hpb=990f879d9af6300068af44c431b1a8e158e7f7a0;p=dcpomatic.git diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index dbcf2677b..4ab5d0942 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington 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,11 +33,13 @@ #include "test.h" #include -using std::string; + using std::list; -using boost::shared_ptr; +using std::make_shared; +using std::string; using namespace dcpomatic; + static string const xml = "" "FFmpeg" "0" @@ -125,15 +129,16 @@ static string const xml = "" "0" ""; + BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test) { - shared_ptr film = new_test_film ("ffmpeg_time_calculation_test"); + auto film = new_test_film ("ffmpeg_time_calculation_test"); - shared_ptr doc (new cxml::Document); + auto doc = make_shared(); doc->read_string (xml); list notes; - shared_ptr content (new FFmpegContent(doc, film->state_version(), notes)); + auto content = make_shared(doc, film->state_version(), notes); /* 25fps content, 25fps DCP */ film->set_video_frame_rate (25); @@ -177,20 +182,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 = new_test_film ("player_time_calculation_test1"); + auto film = new_test_film ("player_time_calculation_test1"); - shared_ptr doc (new cxml::Document); + auto doc = make_shared(); doc->read_string (xml); list notes; - shared_ptr content (new FFmpegContent(doc, film->state_version(), notes)); + auto content = make_shared(doc, film->state_version(), notes); film->set_sequence (false); film->add_content (content); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); /* Position 0, no trim, content rate = DCP rate */ content->set_position (film, DCPTime()); @@ -198,8 +204,8 @@ 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); - shared_ptr piece = player->_pieces.front (); + BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U); + auto piece = player->_pieces.front(); BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0); BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12); BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.0)), 72); @@ -210,7 +216,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); @@ -224,7 +230,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); @@ -241,7 +247,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); @@ -253,7 +259,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); @@ -270,7 +276,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); @@ -289,7 +295,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); @@ -301,7 +307,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); @@ -315,7 +321,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); @@ -333,7 +339,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); @@ -345,7 +351,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); @@ -359,7 +365,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); @@ -373,7 +379,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); @@ -386,17 +392,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 = new_test_film ("player_time_calculation_test2"); + auto film = new_test_film ("player_time_calculation_test2"); - shared_ptr doc (new cxml::Document); + auto doc = make_shared(); doc->read_string (xml); list notes; - shared_ptr content (new FFmpegContent(doc, film->state_version(), notes)); + auto content = make_shared(doc, film->state_version(), notes); film->set_sequence (false); film->add_content (content); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); /* Position 0, no trim, content rate = DCP rate */ content->set_position (film, DCPTime()); @@ -404,8 +410,8 @@ 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); - shared_ptr piece = player->_pieces.front (); + BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U); + auto piece = player->_pieces.front (); BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0); BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get()); BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72).get(), DCPTime::from_seconds(3.0).get()); @@ -416,7 +422,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()); @@ -428,7 +434,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()); @@ -444,7 +450,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()); @@ -456,7 +462,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()); @@ -468,7 +474,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); @@ -486,7 +492,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()); @@ -498,7 +504,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()); @@ -510,7 +516,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()); @@ -527,7 +533,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()); @@ -539,7 +545,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()); @@ -551,7 +557,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()); @@ -562,18 +568,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 = new_test_film ("player_time_calculation_test3"); + auto film = new_test_film ("player_time_calculation_test3"); - shared_ptr doc (new cxml::Document); + auto doc = make_shared(); doc->read_string (xml); list notes; - shared_ptr content (new FFmpegContent(doc, film->state_version(), notes)); - AudioStreamPtr stream = content->audio->streams().front(); + auto content = make_shared(doc, film->state_version(), notes); + auto stream = content->audio->streams().front(); film->set_sequence (false); film->add_content (content); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); /* Position 0, no trim, video/audio content rate = video/audio DCP rate */ content->set_position (film, DCPTime()); @@ -582,8 +588,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 = 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); @@ -595,7 +601,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); @@ -610,7 +616,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); @@ -625,7 +631,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); @@ -638,7 +644,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); @@ -655,7 +661,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); @@ -674,7 +680,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); @@ -687,7 +693,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); @@ -702,7 +708,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); @@ -720,7 +726,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); @@ -733,7 +739,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); @@ -748,7 +754,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); @@ -763,7 +769,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); @@ -776,7 +782,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); @@ -791,7 +797,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); @@ -806,7 +812,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); }