diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 23:06:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 23:06:21 +0000 |
| commit | f41310384889e4cfb6e709d098b316e212d8bf22 (patch) | |
| tree | 01db47dfe9da145e5428b2ce3df6d23ffcda69c4 /test | |
| parent | ed68bfad5c795afb342c5228f3c1dc7770a6d646 (diff) | |
Do image crop/scale/window in the butler prepare threads.
Diffstat (limited to 'test')
| -rw-r--r-- | test/butler_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_playback_test.cc | 11 | ||||
| -rw-r--r-- | test/player_test.cc | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index d1741262b..0ee06c1ac 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), film->log(), map, 6); + Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), film->log(), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false); BOOST_CHECK (butler.get_video().second == DCPTime()); BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24)); diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 17318e0ff..3e3ffe089 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -37,7 +37,16 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) film->examine_and_add_content (content); wait_for_jobs (); - shared_ptr<Butler> butler (new Butler(shared_ptr<Player>(new Player(film, film->playlist())), shared_ptr<Log>(), AudioMapping(6, 6), 6)); + shared_ptr<Butler> butler ( + new Butler( + shared_ptr<Player>(new Player(film, film->playlist())), + shared_ptr<Log>(), + AudioMapping(6, 6), + 6, + bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + false, + true) + ); float* audio_buffer = new float[2000*6]; while (true) { pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (); diff --git a/test/player_test.cc b/test/player_test.cc index 0c9b6f21f..598e7a01a 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -212,7 +212,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2)); + shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2)); + shared_ptr<Butler> butler (new Butler(player, film->log(), AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); |