X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_level_test.cc;h=4483e22d529b7b672f5ea6c0f6c7480e375e2303;hb=7ec6c86c913fba820870565ee757fdf43ae47433;hp=be54cd3f90075f18837f75c059919fbd38336eac;hpb=62f9b78a2eb5f0fc6b9028264bac6ad501d83309;p=dcpomatic.git

diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index be54cd3f9..4483e22d5 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -54,7 +54,6 @@
 
 
 using std::min;
-using std::make_pair;
 using std::max;
 using std::pair;
 using std::string;
@@ -71,7 +70,7 @@ static
 shared_ptr<Image>
 grey_image (dcp::Size size, uint8_t pixel)
 {
-	auto grey = make_shared<Image>(AV_PIX_FMT_RGB24, size, true);
+	auto grey = make_shared<Image>(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) {
@@ -94,7 +93,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_full_range_not_changed)
 	write_image (grey_image(size, grey_pixel), file);
 
 	FFmpegImageProxy proxy (file);
-	ImageProxy::Result result = proxy.image ();
+	ImageProxy::Result result = proxy.image (Image::Alignment::COMPACT);
 	BOOST_REQUIRE (!result.error);
 
 	for (int y = 0; y < size.height; ++y) {
@@ -128,7 +127,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
 		BOOST_REQUIRE (!player->pass());
 	}
 
-	auto image = player_video->image ([](AVPixelFormat f) { return f; }, VideoRange::FULL, true, false);
+	auto image = player_video->image ([](AVPixelFormat f) { return f; }, VideoRange::FULL, false);
 
 	for (int y = 0; y < size.height; ++y) {
 		uint8_t* p = image->data()[0] + y * image->stride()[0];
@@ -214,7 +213,7 @@ pixel_range (shared_ptr<const Film> film, shared_ptr<const Content> content)
 		BOOST_REQUIRE (!decoder->pass());
 	}
 
-	return pixel_range (content_video->image->image().image);
+	return pixel_range (content_video->image->image(Image::Alignment::COMPACT).image);
 }
 
 
@@ -407,7 +406,7 @@ static
 pair<int, int>
 V_movie_range (shared_ptr<Film> film)
 {
-	auto job = make_shared<TranscodeJob>(film);
+	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	job->set_encoder (
 		make_shared<FFmpegEncoder>(film, job, film->file("export.mov"), ExportFormat::PRORES, true, false, false, 23)
 		);