diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-15 22:26:47 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-16 10:12:09 +0200 |
| commit | 0e896f9f37db001f34c876ed5fc50e874f96ae09 (patch) | |
| tree | 29e97f6e86204885fa1a1e55f2726e878313296c /test | |
| parent | b5d3e588919ba89e4dca9cf302b3b29cda5f136c (diff) | |
Use an enum instead of a bool to specify blocking/non-blocking.
Diffstat (limited to 'test')
| -rw-r--r-- | test/butler_test.cc | 6 | ||||
| -rw-r--r-- | test/dcp_playback_test.cc | 2 | ||||
| -rw-r--r-- | test/player_test.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index 787d1c324..e57779334 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -61,9 +61,9 @@ BOOST_AUTO_TEST_CASE (butler_test1) Butler butler (film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false); - BOOST_CHECK (butler.get_video(true, 0).second == DCPTime()); - BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24)); - BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(2, 24)); + BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime()); + BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24)); + BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24)); /* XXX: check the frame contents */ float buffer[256 * 6]; diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 2ab7eaec3..0e57acae4 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) auto audio_buffer = new float[2000 * 6]; while (true) { - auto p = butler->get_video (true, 0); + auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0); if (!p.first) { break; } diff --git a/test/player_test.cc b/test/player_test.cc index 5ed772193..cafb14586 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) for (int i = 0; i < 10; ++i) { auto t = DCPTime::from_frames (i, 24); butler->seek (t, true); - auto video = butler->get_video(true, 0); + auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, 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 @@ -273,7 +273,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) for (int i = 0; i < 10; ++i) { auto t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24); butler->seek (t, true); - auto video = butler->get_video(true, 0); + auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); write_image( video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test2_%1.png", i) |