X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=2ab7eaec37deb90d6b0ad1ea3ca6f649ad5ae251;hb=9751270721fe4560eae0f53ac1e42ad0ebc80028;hp=ef1b623e78ffc8f7a67ef1f46dbd9ae37628ecb9;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index ef1b623e7..2ab7eaec3 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -28,9 +28,7 @@ using std::make_shared; -using std::pair; -using std::shared_ptr; -using boost::optional; +using std::make_shared; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -47,13 +45,14 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) auto butler = std::make_shared( film, - shared_ptr(new Player(film)), + make_shared(film, Image::Alignment::PADDED), AudioMapping(6, 6), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, - false, - true + Image::Alignment::PADDED, + true, + false ); auto audio_buffer = new float[2000 * 6]; @@ -64,7 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) } /* assuming DCP is 24fps/48kHz */ butler->get_audio (audio_buffer, 2000); - p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true); + p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } delete[] audio_buffer; }