/*
- 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.
*/
+
/** @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"
#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::string;
+using namespace dcpomatic;
+
static string const xml = "<Content>"
"<Type>FFmpeg</Type>"
"<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);
}
+
/** 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, Image::Alignment::COMPACT);
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
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_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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
/** 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, Image::Alignment::COMPACT);
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
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_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());
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());
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());
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());
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());
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);
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());
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());
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());
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());
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());
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());
/** 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, Image::Alignment::COMPACT);
/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime());
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
}