diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:43:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:43:52 +0000 |
| commit | ed68bfad5c795afb342c5228f3c1dc7770a6d646 (patch) | |
| tree | ebf0a5b7f2c9b1636c498715f0f7aaaf8dcc98f7 /test/player_test.cc | |
| parent | e5b744922fb6aed65ec13f22a9de0c86dd1bd561 (diff) | |
Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.
Diffstat (limited to 'test/player_test.cc')
| -rw-r--r-- | test/player_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/player_test.cc b/test/player_test.cc index 9351d3dd3..0c9b6f21f 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) butler->seek (t, true); pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB"); + 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.011 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. @@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) butler->seek (t, true); pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB"); + 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.011); } } |