From 4f9314a311de379b105741273a15821da62a75cc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Apr 2022 00:42:57 +0200 Subject: [PATCH] Cleanup: remove unused parameter to PlayerVideo::force. --- src/lib/ffmpeg_encoder.cc | 2 +- src/lib/ffmpeg_file_encoder.cc | 2 +- src/lib/player_video.cc | 2 +- src/lib/player_video.h | 2 +- src/wx/film_viewer.cc | 2 +- src/wx/gl_video_view.cc | 2 +- src/wx/simple_video_view.cc | 2 +- test/butler_test.cc | 6 ++++-- test/dcp_playback_test.cc | 4 ++-- test/player_test.cc | 10 +++++----- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 81ea3a9dd..8f36bbda1 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder ( } _butler = std::make_shared( - _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false + _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false ); } diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 6f13f5dd6..57103abc7 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -399,7 +399,7 @@ FFmpegFileEncoder::video (shared_ptr video, DCPTime time) { /* All our output formats are video range at the moment */ auto image = video->image ( - bind (&PlayerVideo::force, _1, _pixel_format), + bind (&PlayerVideo::force, _pixel_format), VideoRange::VIDEO, false ); diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 081147434..d45bf9f43 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -298,7 +298,7 @@ PlayerVideo::same (shared_ptr other) const AVPixelFormat -PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to) +PlayerVideo::force (AVPixelFormat force_to) { return force_to; } diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 237d2e3fe..f2781c1a0 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -79,7 +79,7 @@ public: std::shared_ptr image (std::function pixel_format, VideoRange video_range, bool fast) const; std::shared_ptr raw_image () const; - static AVPixelFormat force (AVPixelFormat, AVPixelFormat); + static AVPixelFormat force (AVPixelFormat); static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat); void add_metadata (xmlpp::Node* node) const; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index ac12bea3f..cd5b6e2ea 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -223,7 +223,7 @@ FilmViewer::recreate_butler () _player, Config::instance()->audio_mapping(_audio_channels), _audio_channels, - bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED, true, diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 640b6a373..dee45cd13 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -508,7 +508,7 @@ GLVideoView::draw () void GLVideoView::set_image (shared_ptr pv) { - shared_ptr video = _optimise_for_j2k ? pv->raw_image() : pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + shared_ptr video = _optimise_for_j2k ? pv->raw_image() : pv->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); /* Only the player's black frames should be aligned at this stage, so this should * almost always have no work to do. diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index f4ff9a4eb..8d5cb95f8 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -224,7 +224,7 @@ SimpleVideoView::update () _state_timer.set ("get image"); - _image = player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + _image = player_video().first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); _state_timer.set ("ImageChanged"); _viewer->image_changed (player_video().first); diff --git a/test/butler_test.cc b/test/butler_test.cc index bee66217f..0422b89ad 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (film, make_shared(film, Image::Alignment::COMPACT), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false); + Butler butler (film, make_shared(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false); 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)); @@ -94,7 +94,9 @@ BOOST_AUTO_TEST_CASE (butler_test2) map.set (i, i, 1); } - Butler butler (film, make_shared(film, Image::Alignment::COMPACT), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false); + Butler butler ( + film, make_shared(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false + ); int const audio_frames_per_video_frame = 48000 / 25; float audio_buffer[audio_frames_per_video_frame * 6]; diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 66a735798..74d5edd3f 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) make_shared(film, Image::Alignment::PADDED), AudioMapping(6, 6), 6, - bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) } /* assuming DCP is 24fps/48kHz */ butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000); - p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + p.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } delete[] audio_buffer; } diff --git a/test/player_test.cc b/test/player_test.cc index 0d3af5f8c..3fb8691a5 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false); + auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -241,7 +241,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) butler->seek (t, true); 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)); + write_image(video.first->image(bind(PlayerVideo::force, 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 (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. @@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false); + auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); @@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) 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) + video.first->image(bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test2_%1.png", i) ); check_image(TestPaths::private_data() / String::compose("player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08); } @@ -356,7 +356,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) auto player = std::make_shared(film, Image::Alignment::COMPACT); player->set_fast (); - auto butler = std::make_shared(film, player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false); + auto butler = std::make_shared(film, player, AudioMapping(), 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false); /* Wait for the butler to fill */ dcpomatic_sleep_seconds (5); -- 2.30.2