avifrgbtoyuvtest: Add tests for YUV with alpha
Add a has_alpha parameter to YUVToRGBThreadingTests which will
test the multi-threaded validity of YUV images with Alpha plane as
well.
Also replace one of the rgb formats in the default test
instantiation with the more commonly used RGBA (instead of ARGB).
diff --git a/tests/gtest/avifrgbtoyuvtest.cc b/tests/gtest/avifrgbtoyuvtest.cc
index c442d64..a5ccc2b 100644
--- a/tests/gtest/avifrgbtoyuvtest.cc
+++ b/tests/gtest/avifrgbtoyuvtest.cc
@@ -741,7 +741,8 @@
: public testing::TestWithParam<std::tuple<
/*rgb_depth=*/int, /*yuv_depth=*/int,
/*width=*/int, /*height=*/int, avifRGBFormat, avifPixelFormat,
- /*threads=*/int, /*avoidLibYUV=*/bool, avifChromaUpsampling>> {};
+ /*threads=*/int, /*avoidLibYUV=*/bool, avifChromaUpsampling,
+ /*has_alpha=*/bool>> {};
TEST_P(YUVToRGBThreadingTest, TestIdentical) {
const int rgb_depth = std::get<0>(GetParam());
@@ -753,6 +754,7 @@
const int maxThreads = std::get<6>(GetParam());
const bool avoidLibYUV = std::get<7>(GetParam());
const avifChromaUpsampling chromaUpsampling = std::get<8>(GetParam());
+ const bool has_alpha = std::get<9>(GetParam());
if (rgb_depth > 8 && rgb_format == AVIF_RGB_FORMAT_RGB_565) {
return;
@@ -764,19 +766,20 @@
yuv->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT601;
yuv->yuvRange = AVIF_RANGE_FULL;
- // Fill YUV planes with random values.
+ // Fill YUVA planes with random values.
srand(0xAABBCCDD);
const int yuv_max = (1 << yuv_depth);
- ASSERT_EQ(avifImageAllocatePlanes(yuv.get(), AVIF_PLANES_YUV),
+ ASSERT_EQ(avifImageAllocatePlanes(
+ yuv.get(), has_alpha ? AVIF_PLANES_ALL : AVIF_PLANES_YUV),
AVIF_RESULT_OK);
- avifPixelFormatInfo pixel_format_info;
- avifGetPixelFormatInfo(yuv_format, &pixel_format_info);
- const int plane_count = pixel_format_info.monochrome ? 1 : 3;
- for (int plane = 0; plane < plane_count; ++plane) {
+ for (int plane = AVIF_CHAN_Y; plane <= AVIF_CHAN_A; ++plane) {
+ const uint32_t plane_width = avifImagePlaneWidth(yuv.get(), plane);
+ if (plane_width == 0) continue;
+ const uint32_t plane_height = avifImagePlaneHeight(yuv.get(), plane);
+ const uint32_t rowBytes = avifImagePlaneRowBytes(yuv.get(), plane);
uint8_t* row = avifImagePlane(yuv.get(), plane);
- for (uint32_t y = 0; y < avifImagePlaneHeight(yuv.get(), plane);
- ++y, row += yuv.get()->yuvRowBytes[plane]) {
- for (uint32_t x = 0; x < avifImagePlaneWidth(yuv.get(), plane); ++x) {
+ for (uint32_t y = 0; y < plane_height; ++y, row += rowBytes) {
+ for (uint32_t x = 0; x < plane_width; ++x) {
if (yuv_depth == 8) {
row[x] = (uint8_t)(rand() % yuv_max);
} else {
@@ -808,14 +811,15 @@
/*yuv_depth=*/Values(8, 10),
/*width=*/Values(1, 2, 127, 200),
/*height=*/Values(1, 2, 127, 200),
- Values(AVIF_RGB_FORMAT_RGB, AVIF_RGB_FORMAT_ARGB),
+ Values(AVIF_RGB_FORMAT_RGB, AVIF_RGB_FORMAT_RGBA),
Range(AVIF_PIXEL_FORMAT_YUV444, AVIF_PIXEL_FORMAT_COUNT),
// Test an odd and even number for threads. Not adding all possible
// thread values to keep the number of test instances low.
/*threads=*/Values(2, 7),
/*avoidLibYUV=*/Values(true, false),
Values(AVIF_CHROMA_UPSAMPLING_FASTEST,
- AVIF_CHROMA_UPSAMPLING_BILINEAR)));
+ AVIF_CHROMA_UPSAMPLING_BILINEAR),
+ /*has_alpha=*/::testing::Bool()));
// This will generate a large number of test instances and hence it is disabled
// by default. It can be run manually if necessary.
@@ -832,7 +836,8 @@
Values(AVIF_CHROMA_UPSAMPLING_AUTOMATIC,
AVIF_CHROMA_UPSAMPLING_FASTEST,
AVIF_CHROMA_UPSAMPLING_NEAREST,
- AVIF_CHROMA_UPSAMPLING_BILINEAR)));
+ AVIF_CHROMA_UPSAMPLING_BILINEAR),
+ /*has_alpha=*/::testing::Bool()));
} // namespace
} // namespace libavif
