X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_level_test.cc;h=e2419d8e734c96f0ef92add497afb2062a0d5f75;hb=ef25237193100de106eccdb8f40524fa670bda76;hp=fd221468499728646f6cafc6d4ebf8f2e0bc536e;hpb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;p=dcpomatic.git

diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index fd2214684..e2419d8e7 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -114,9 +114,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
 
 	write_image(grey_image(size, grey_pixel), file);
 
-	auto content = content_factory(file).front();
-	auto film = new_test_film2 ("ffmpeg_image_video_range_expanded", { content });
-	content->video->set_range (VideoRange::VIDEO);
+	auto content = content_factory(file);
+	auto film = new_test_film2 ("ffmpeg_image_video_range_expanded", content);
+	content[0]->video->set_range (VideoRange::VIDEO);
 	auto player = make_shared<Player>(film, film->playlist());
 
 	shared_ptr<PlayerVideo> player_video;
@@ -138,6 +138,57 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
 }
 
 
+BOOST_AUTO_TEST_CASE(yuv_expanded_into_full_rgb)
+{
+	auto convert = [](int y_val, int u_val, int v_val, AVPixelFormat pix_fmt) {
+		auto const size = dcp::Size(640, 480);
+		auto yuv = make_shared<Image>(AV_PIX_FMT_YUVA444P12LE, size, Image::Alignment::PADDED);
+		BOOST_REQUIRE_EQUAL(yuv->planes(), 4);
+		for (int y = 0; y < size.height; ++y) {
+			uint16_t* Y = reinterpret_cast<uint16_t*>(yuv->data()[0] + y * yuv->stride()[0]);
+			uint16_t* U = reinterpret_cast<uint16_t*>(yuv->data()[1] + y * yuv->stride()[1]);
+			uint16_t* V = reinterpret_cast<uint16_t*>(yuv->data()[2] + y * yuv->stride()[2]);
+			uint16_t* A = reinterpret_cast<uint16_t*>(yuv->data()[3] + y * yuv->stride()[3]);
+			for (int x = 0; x < size.width; ++x) {
+				*Y++ = y_val;
+				*U++ = u_val;
+				*V++ = v_val;
+				*A++ = 4096;
+			}
+		}
+
+		return yuv->crop_scale_window(
+			Crop(), size, size, dcp::YUVToRGB::REC709,
+			VideoRange::VIDEO,
+			pix_fmt,
+			VideoRange::FULL,
+			Image::Alignment::COMPACT,
+			false
+			);
+	};
+
+	auto white24 = convert(3760, 2048, 2048, AV_PIX_FMT_RGB24);
+	BOOST_CHECK_EQUAL(white24->data()[0][0], 255);
+	BOOST_CHECK_EQUAL(white24->data()[0][1], 255);
+	BOOST_CHECK_EQUAL(white24->data()[0][2], 255);
+
+	auto black24 = convert(256, 2048, 2048, AV_PIX_FMT_RGB24);
+	BOOST_CHECK_EQUAL(black24->data()[0][0], 0);
+	BOOST_CHECK_EQUAL(black24->data()[0][1], 0);
+	BOOST_CHECK_EQUAL(black24->data()[0][2], 0);
+
+	auto white48 = convert(3760, 2048, 2048, AV_PIX_FMT_RGB48LE);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(white48->data()[0])[0], 65283);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(white48->data()[0])[1], 65283);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(white48->data()[0])[2], 65283);
+
+	auto black48 = convert(256, 2048, 2048, AV_PIX_FMT_RGB48LE);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(black48->data()[0])[0], 0);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(black48->data()[0])[1], 0);
+	BOOST_CHECK_EQUAL(reinterpret_cast<uint16_t*>(black48->data()[0])[2], 0);
+}
+
+
 static
 pair<int, int>
 pixel_range (shared_ptr<const Image> image)
@@ -260,7 +311,7 @@ shared_ptr<Film>
 movie_V (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4").front());
+	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -278,7 +329,7 @@ shared_ptr<Film>
 movie_VoF (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4").front());
+	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -297,7 +348,7 @@ shared_ptr<Film>
 movie_F (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov").front());
+	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -315,7 +366,7 @@ shared_ptr<Film>
 movie_FoV (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov").front());
+	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -334,7 +385,7 @@ shared_ptr<Film>
 image_F (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png").front());
+	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -352,7 +403,7 @@ shared_ptr<Film>
 image_FoV (string name)
 {
 	auto film = new_test_film2 (name);
-	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png").front());
+	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());