From: Carl Hetherington <cth@carlh.net>
Date: Sun, 2 May 2021 23:38:11 +0000 (+0200)
Subject: Add pixel format 0 (AV_PIX_FMT_YUV420P) to make_part_black().
X-Git-Tag: v2.15.141~3
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0aabe4060ea4bad7c7caac633aef0737fccff8c2

Add pixel format 0 (AV_PIX_FMT_YUV420P) to make_part_black().

Remainder of fix for #1984.
---

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 63ae34ce9..c4312cb8e 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -392,6 +392,17 @@ Image::swap_16 (uint16_t v)
 void
 Image::make_part_black (int const start, int const width)
 {
+	auto y_part = [&]() {
+		int const bpp = bytes_per_pixel(0);
+		int const h = sample_size(0).height;
+		int const s = stride()[0];
+		auto p = data()[0];
+		for (int y = 0; y < h; ++y) {
+			memset (p + start * bpp, 0, width * bpp);
+			p += s;
+		}
+	};
+
 	switch (_pixel_format) {
 	case AV_PIX_FMT_RGB24:
 	case AV_PIX_FMT_ARGB:
@@ -413,20 +424,28 @@ Image::make_part_black (int const start, int const width)
 		}
 		break;
 	}
-	case AV_PIX_FMT_YUV422P10LE:
+	case AV_PIX_FMT_YUV420P:
 	{
-		int const bpp_0 = bytes_per_pixel(0);
-		int const h_0 = sample_size(0).height;
-		int const stride_0 = stride()[0];
-		auto p = data()[0];
-		for (int y = 0; y < h_0; ++y) {
-			memset (p + start * bpp_0, 0xff, width * bpp_0);
-			p += stride_0;
+		y_part ();
+		for (int i = 1; i < 3; ++i) {
+			auto p = data()[i];
+			int const h = sample_size(i).height;
+			for (int y = 0; y < h; ++y) {
+				for (int x = start / 2; x < (start + width) / 2; ++x) {
+					p[x] = eight_bit_uv;
+				}
+				p += stride()[i];
+			}
 		}
+		break;
+	}
+	case AV_PIX_FMT_YUV422P10LE:
+	{
+		y_part ();
 		for (int i = 1; i < 3; ++i) {
 			auto p = reinterpret_cast<int16_t*>(data()[i]);
-			int const lines = sample_size(i).height;
-			for (int y = 0; y < lines; ++y) {
+			int const h = sample_size(i).height;
+			for (int y = 0; y < h; ++y) {
 				for (int x = start / 2; x < (start + width) / 2; ++x) {
 					p[x] = ten_bit_uv;
 				}
diff --git a/test/image_test.cc b/test/image_test.cc
index bbaf9bd74..0993be6cf 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -514,6 +514,7 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
 		AV_PIX_FMT_RGBA,
 		AV_PIX_FMT_ABGR,
 		AV_PIX_FMT_BGRA,
+		AV_PIX_FMT_YUV420P,
 		AV_PIX_FMT_YUV422P10LE,
 	};