diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-07-24 20:42:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-07-24 20:42:50 +0100 |
| commit | 335ef709439cd3678f6813a3fb880110e4c9cb26 (patch) | |
| tree | 31ce9d5b82eb789d702133ab64493bd7b20ded93 /test | |
| parent | 697d21c3f9bc6243151372f988936662b9993510 (diff) | |
Optimise the feel of some GUI functions by doing the seek after
many content changes in an idle handler, rather than blocking
the UI update until the seek and image redisplay have finished.
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 cc2841268..7aeba78f9 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -54,9 +54,9 @@ BOOST_AUTO_TEST_CASE (butler_test1) Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), 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)); - BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(2, 24)); + 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)); /* XXX: check the frame contents */ float buffer[256 * 6]; diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 9fef1801b..1dda667a0 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) ); float* audio_buffer = new float[2000*6]; while (true) { - pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (); + pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (true, 0); if (!p.first) { break; } diff --git a/test/player_test.cc b/test/player_test.cc index 7b65783c6..af40002de 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) for (int i = 0; i < 10; ++i) { DCPTime t = DCPTime::from_frames (i, 24); butler->seek (t, true); - pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); + 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 @@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) for (int i = 0; i < 10; ++i) { DCPTime t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24); butler->seek (t, true); - pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); + 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); |