X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_level_test.cc;h=4483e22d529b7b672f5ea6c0f6c7480e375e2303;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=acf7fb4e2919a1084fb5c4667f4b710249a18ea7;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git diff --git a/test/video_level_test.cc b/test/video_level_test.cc index acf7fb4e2..4483e22d5 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -28,6 +28,7 @@ #include "lib/content_factory.h" #include "lib/content_video.h" #include "lib/dcp_content.h" +#include "lib/decoder_factory.h" #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/ffmpeg_decoder.h" @@ -37,6 +38,8 @@ #include "lib/image_decoder.h" #include "lib/ffmpeg_encoder.h" #include "lib/job_manager.h" +#include "lib/player.h" +#include "lib/player_video.h" #include "lib/transcode_job.h" #include "lib/video_decoder.h" #include "test.h" @@ -51,7 +54,6 @@ using std::min; -using std::make_pair; using std::max; using std::pair; using std::string; @@ -68,7 +70,7 @@ static shared_ptr grey_image (dcp::Size size, uint8_t pixel) { - auto grey = make_shared(AV_PIX_FMT_RGB24, size, true); + auto grey = make_shared(AV_PIX_FMT_RGB24, size, Image::Alignment::PADDED); for (int y = 0; y < size.height; ++y) { uint8_t* p = grey->data()[0] + y * grey->stride()[0]; for (int x = 0; x < size.width; ++x) { @@ -90,8 +92,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_full_range_not_changed) write_image (grey_image(size, grey_pixel), file); - FFmpegImageProxy proxy (file, VideoRange::FULL); - ImageProxy::Result result = proxy.image (); + FFmpegImageProxy proxy (file); + ImageProxy::Result result = proxy.image (Image::Alignment::COMPACT); BOOST_REQUIRE (!result.error); for (int y = 0; y < size.height; ++y) { @@ -105,19 +107,30 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_full_range_not_changed) BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded) { - dcp::Size size(640, 480); + dcp::Size size(1998, 1080); uint8_t const grey_pixel = 128; - uint8_t const expanded_grey_pixel = static_cast((grey_pixel - 16) * 256.0 / 219); + uint8_t const expanded_grey_pixel = static_cast(lrintf((grey_pixel - 16) * 256.0 / 219)); boost::filesystem::path const file = "build/test/ffmpeg_image_video_range_expanded.png"; - write_image (grey_image(size, grey_pixel), file); + write_image(grey_image(size, grey_pixel), file); - FFmpegImageProxy proxy (file, VideoRange::VIDEO); - ImageProxy::Result result = proxy.image (); - BOOST_REQUIRE (!result.error); + auto content = content_factory(file).front(); + auto film = new_test_film2 ("ffmpeg_image_video_range_expanded", { content }); + content->video->set_range (VideoRange::VIDEO); + auto player = make_shared(film, film->playlist()); + + shared_ptr player_video; + player->Video.connect([&player_video](shared_ptr pv, dcpomatic::DCPTime) { + player_video = pv; + }); + while (!player_video) { + BOOST_REQUIRE (!player->pass()); + } + + auto image = player_video->image ([](AVPixelFormat f) { return f; }, VideoRange::FULL, false); for (int y = 0; y < size.height; ++y) { - uint8_t* p = result.image->data()[0] + y * result.image->stride()[0]; + uint8_t* p = image->data()[0] + y * image->stride()[0]; for (int x = 0; x < size.width; ++x) { BOOST_REQUIRE_EQUAL (*p++, expanded_grey_pixel); } @@ -125,17 +138,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded) } -static optional content_video; - - -static -void -video_handler (ContentVideo cv) -{ - content_video = cv; -} - - static pair pixel_range (shared_ptr image) @@ -195,33 +197,23 @@ pixel_range (shared_ptr image) } +/** @return pixel range of the first frame in @ref content in its raw form, i.e. + * straight out of the decoder with no level processing, scaling etc. + */ static pair -pixel_range (shared_ptr film, shared_ptr content) -{ - auto decoder = make_shared(film, content, false); - decoder->video->Data.connect (bind(&video_handler, _1)); - content_video = boost::none; - while (!content_video) { - BOOST_REQUIRE (!decoder->pass()); - } - - return pixel_range (content_video->image->image().image); -} - - -static -pair -pixel_range (shared_ptr film, shared_ptr content) +pixel_range (shared_ptr film, shared_ptr content) { - auto decoder = make_shared(film, content); - decoder->video->Data.connect (bind(&video_handler, _1)); - content_video = boost::none; + auto decoder = decoder_factory(film, content, false, false, shared_ptr()); + optional content_video; + decoder->video->Data.connect ([&content_video](ContentVideo cv) { + content_video = cv; + }); while (!content_video) { BOOST_REQUIRE (!decoder->pass()); } - return pixel_range (content_video->image->image().image); + return pixel_range (content_video->image->image(Image::Alignment::COMPACT).image); } @@ -367,8 +359,11 @@ image_FoV (string name) content->video->set_range (VideoRange::VIDEO); auto range = pixel_range (film, content); - BOOST_CHECK_EQUAL (range.first, 11); - BOOST_CHECK_EQUAL (range.second, 250); + /* We are taking some full-range content and saying it should be read as video range, after which its + * pixels will still be full range. + */ + BOOST_CHECK_EQUAL (range.first, 0); + BOOST_CHECK_EQUAL (range.second, 255); return film; } @@ -411,7 +406,7 @@ static pair V_movie_range (shared_ptr film) { - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); job->set_encoder ( make_shared(film, job, film->file("export.mov"), ExportFormat::PRORES, true, false, false, 23) ); @@ -474,7 +469,10 @@ BOOST_AUTO_TEST_CASE (image_F_to_dcp) BOOST_AUTO_TEST_CASE (image_FoV_to_dcp) { auto range = dcp_range (image_FoV("image_FoV_to_dcp")); - check_int_close (range, {430, 4012}, 2); + /* The nearly-full-range of the input has become even more full, and clipped. + * XXX: I'm not sure why this doesn't quite hit 4095. + */ + check_int_close (range, {0, 4095}, 16); } @@ -521,8 +519,8 @@ BOOST_AUTO_TEST_CASE (image_F_to_V_movie) BOOST_AUTO_TEST_CASE (image_FoV_to_V_movie) { auto range = V_movie_range (image_FoV("image_FoV_to_V_movie")); - BOOST_CHECK_EQUAL (range.first, 102); - BOOST_CHECK_EQUAL (range.second, 923); + BOOST_CHECK_EQUAL (range.first, 64); + BOOST_CHECK_EQUAL (range.second, 960); }