using boost::shared_ptr;
using boost::bind;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
static shared_ptr<AudioBuffers> accumulated;
accumulated.reset (new AudioBuffers (film->audio_channels(), 0));
- shared_ptr<Player> player (new Player (film, film->playlist ()));
+ shared_ptr<Player> player (new Player(film));
player->Audio.connect (bind (&accumulate, _1, _2));
while (!player->pass ()) {}
BOOST_REQUIRE (accumulated->frames() >= 48000);
film->examine_and_add_content (contentB);
BOOST_REQUIRE (!wait_for_jobs());
- contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
contentA->video->set_length (3);
contentA->set_position (film, DCPTime::from_frames(2, film->video_frame_rate()));
- contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentA->video->set_custom_ratio (1.85);
contentB->video->set_length (1);
contentB->set_position (film, DCPTime::from_frames(7, film->video_frame_rate()));
+ contentB->video->set_custom_ratio (1.85);
film->make_dcp ();
/* Length should be rounded up from B's length to the next video frame */
BOOST_CHECK (film->length() == DCPTime::from_frames(3 * 24 + 1, 24));
- shared_ptr<Player> player (new Player (film, film->playlist ()));
+ shared_ptr<Player> player (new Player(film));
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1U);
BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
- BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1U);
BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
}
film->examine_and_add_content (s);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<Player> player (new Player(film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
player->Video.connect (bind (&video, _1, _2));
player->Audio.connect (bind (&audio, _1, _2));
video_frames = audio_frames = 0;
BOOST_AUTO_TEST_CASE (player_seek_test)
{
shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
- shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs"));
+ shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data() / "awkward_subs"));
film->examine_and_add_content (dcp, true);
BOOST_REQUIRE (!wait_for_jobs ());
dcp->only_text()->set_use (true);
- shared_ptr<Player> player (new Player (film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
player->set_fast ();
player->set_always_burn_open_subtitles ();
player->set_play_referenced ();
butler->seek (t, true);
pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
BOOST_CHECK_EQUAL(video.second.get(), t.get());
- write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB");
- /* This 0.055 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
+ write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i));
+ /* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
(17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing
text altogether.
*/
- check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 0.055);
+ check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 14.08);
}
}
BOOST_AUTO_TEST_CASE (player_seek_test2)
{
shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
- shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs2"));
+ shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data() / "awkward_subs2"));
film->examine_and_add_content (dcp, true);
BOOST_REQUIRE (!wait_for_jobs ());
dcp->only_text()->set_use (true);
- shared_ptr<Player> player (new Player (film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
player->set_fast ();
player->set_always_burn_open_subtitles ();
player->set_play_referenced ();
butler->seek (t, true);
pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
BOOST_CHECK_EQUAL(video.second.get(), t.get());
- write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB");
- check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.055);
+ write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i));
+ check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08);
}
}
BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
{
shared_ptr<Film> film = new_test_film2 ("player_ignore_video_and_audio_test");
- shared_ptr<Content> ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+ shared_ptr<Content> ff = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
film->examine_and_add_content (ff);
shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
film->examine_and_add_content (text);
text->only_text()->set_type (TEXT_CLOSED_CAPTION);
text->only_text()->set_use (true);
- shared_ptr<Player> player (new Player(film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
player->set_ignore_video ();
player->set_ignore_audio ();
player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
while (!player->pass ()) {}
- BOOST_CHECK_EQUAL (out.size(), 6);
+ BOOST_CHECK_EQUAL (out.size(), 6U);
}
/** Trigger a crash due to the assertion failure in Player::emit_audio */
BOOST_AUTO_TEST_CASE (player_trim_crash)
{
shared_ptr<Film> film = new_test_film2 ("player_trim_crash");
- shared_ptr<Content> boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+ shared_ptr<Content> boon = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
film->examine_and_add_content (boon);
BOOST_REQUIRE (!wait_for_jobs());
- shared_ptr<Player> player (new Player(film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
player->set_fast ();
shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
BOOST_REQUIRE (!wait_for_jobs());
content3->set_position (film2, DCPTime::from_seconds(1.5));
film2->set_video_frame_rate (24);
- std::cout << "Here we go.\n";
film2->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
}