Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix grid alpha #857

Closed
wants to merge 2 commits into from
+67 −32
Closed

Fix grid alpha #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b44384
Fix FillImageGrid() yuvFormat assertion for alpha
y-guyon Feb 17, 2022
5d8075e
Declare createAlpha and expectedSuccess as avifBool
wantehchang Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/avif/avif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ AVIF_API void avifRWDataFree(avifRWData * raw);

typedef enum avifPixelFormat
{
// No pixels are present
// No YUV pixels are present. Alpha plane can still be present.
AVIF_PIXEL_FORMAT_NONE = 0,

AVIF_PIXEL_FORMAT_YUV444,
Expand Down
3 changes: 2 additions & 1 deletion src/read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,8 @@ static avifBool avifDecoderDataFillImageGrid(avifDecoderData * data,
}

if (alpha) {
assert(firstTile->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400);
// An alpha tile does not contain any YUV pixel.
assert(firstTile->image->yuvFormat == AVIF_PIXEL_FORMAT_NONE);
}
if (!avifAreGridDimensionsValid(firstTile->image->yuvFormat,
grid->outputWidth,
Expand Down
94 changes: 64 additions & 30 deletions tests/avifgridapitest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,41 @@

#include "avif/avif.h"

#include <assert.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

//------------------------------------------------------------------------------

// Fills a plane with a repeating gradient.
static void fillPlane(int width, int height, int depth, uint8_t * row, uint32_t rowBytes)
{
assert(depth == 8 || depth == 10 || depth == 12); // Values allowed by AV1.
const int maxValuePlusOne = 1 << depth;
for (int y = 0; y < height; ++y) {
if (depth == 8) {
memset(row, y % maxValuePlusOne, width);
} else {
for (int x = 0; x < width; ++x) {
((uint16_t *)row)[x] = (uint16_t)(y % maxValuePlusOne);
}
}
row += rowBytes;
}
}

// Creates an image where the pixel values are defined but do not matter.
// Returns false in case of memory failure.
static avifBool createImage(int width, int height, int depth, avifPixelFormat yuvFormat, avifImage ** image)
static avifBool createImage(int width, int height, int depth, avifPixelFormat yuvFormat, avifBool createAlpha, avifImage ** image)
{
*image = avifImageCreate(width, height, depth, yuvFormat);
if (*image == NULL) {
printf("ERROR: avifImageCreate() failed\n");
return AVIF_FALSE;
}
avifImageAllocatePlanes(*image, AVIF_PLANES_YUV);
avifImageAllocatePlanes(*image, createAlpha ? AVIF_PLANES_ALL : AVIF_PLANES_YUV);
if (width * height == 0) {
return AVIF_TRUE;
}
Expand All @@ -31,26 +49,28 @@ static avifBool createImage(int width, int height, int depth, avifPixelFormat yu

const int planeCount = formatInfo.monochrome ? 1 : AVIF_PLANE_COUNT_YUV;
for (int plane = 0; plane < planeCount; ++plane) {
const uint32_t widthByteCount = ((plane == AVIF_CHAN_Y) ? (*image)->width : uvWidth) * (((*image)->depth > 8) ? 2 : 1);
const uint32_t planeHeight = (plane == AVIF_CHAN_Y) ? (*image)->height : uvHeight;
uint8_t * row = (*image)->yuvPlanes[plane];
for (uint32_t y = 0; y < planeHeight; ++y) {
memset(row, (int)(y % 256), widthByteCount); // Fill with a repeating gradient.
row += (*image)->yuvRowBytes[plane];
}
fillPlane((plane == AVIF_CHAN_Y) ? (*image)->width : uvWidth,
(plane == AVIF_CHAN_Y) ? (*image)->height : uvHeight,
(*image)->depth,
(*image)->yuvPlanes[plane],
(*image)->yuvRowBytes[plane]);
}

if (createAlpha) {
fillPlane((*image)->width, (*image)->height, (*image)->depth, (*image)->alphaPlane, (*image)->alphaRowBytes);
}
return AVIF_TRUE;
}

// Generates then encodes a grid image. Returns false in case of failure.
static avifBool encodeGrid(int columns, int rows, int cellWidth, int cellHeight, int depth, avifPixelFormat yuvFormat, avifRWData * output)
static avifBool encodeGrid(int columns, int rows, int cellWidth, int cellHeight, int depth, avifPixelFormat yuvFormat, avifBool createAlpha, avifRWData * output)
{
avifBool success = AVIF_FALSE;
avifEncoder * encoder = NULL;
avifImage ** cellImages = avifAlloc(sizeof(avifImage *) * columns * rows);
memset(cellImages, 0, sizeof(avifImage *) * columns * rows);
for (int iCell = 0; iCell < columns * rows; ++iCell) {
if (!createImage(cellWidth, cellHeight, depth, yuvFormat, &cellImages[iCell])) {
if (!createImage(cellWidth, cellHeight, depth, yuvFormat, createAlpha, &cellImages[iCell])) {
goto cleanup;
}
}
Expand Down Expand Up @@ -117,16 +137,16 @@ static avifBool decode(const avifRWData * encodedAvif)
//------------------------------------------------------------------------------

// Generates, encodes then decodes a grid image.
static avifBool encodeDecode(int columns, int rows, int cellWidth, int cellHeight, avifPixelFormat yuvFormat, int expected_success)
static avifBool encodeDecode(int columns, int rows, int cellWidth, int cellHeight, int depth, avifPixelFormat yuvFormat, avifBool createAlpha, avifBool expectedSuccess)
{
avifBool success = AVIF_FALSE;
avifRWData encodedAvif = { 0 };
if (encodeGrid(columns, rows, cellWidth, cellHeight, /*depth=*/8, yuvFormat, &encodedAvif) != expected_success) {
if (encodeGrid(columns, rows, cellWidth, cellHeight, depth, yuvFormat, createAlpha, &encodedAvif) != expectedSuccess) {
goto cleanup;
}
// Only decode if the encoding was expected to succeed.
// Any successful encoding shall result in a valid decoding.
if (expected_success && !decode(&encodedAvif)) {
if (expectedSuccess && !decode(&encodedAvif)) {
goto cleanup;
}
success = AVIF_TRUE;
Expand All @@ -137,22 +157,36 @@ static avifBool encodeDecode(int columns, int rows, int cellWidth, int cellHeigh

//------------------------------------------------------------------------------

// For each dimension, for each combination of cell count and size, generates, encodes then decodes a grid image.
// For each bit depth, with and without alpha, generates, encodes then decodes a grid image.
static avifBool encodeDecodeDepthsAlpha(int columns, int rows, int cellWidth, int cellHeight, avifPixelFormat yuvFormat, avifBool expectedSuccess)
{
const int depths[] = { 8, 10, 12 }; // See avifEncoderAddImageInternal()
for (size_t d = 0; d < sizeof(depths) / sizeof(depths[0]); ++d) {
for (avifBool createAlpha = AVIF_FALSE; createAlpha <= AVIF_TRUE; ++createAlpha) {
if (!encodeDecode(columns, rows, cellWidth, cellHeight, depths[d], yuvFormat, createAlpha, expectedSuccess)) {
return AVIF_FALSE;
}
}
}
return AVIF_TRUE;
}

// For each dimension, for each combination of cell count and size, generates, encodes then decodes a grid image for several depths and alpha.
static avifBool encodeDecodeSizes(const int columnsCellWidths[][2],
int horizontalCombinationCount,
const int rowsCellHeights[][2],
int verticalCombinationCount,
avifPixelFormat yuvFormat,
int expected_success)
avifBool expectedSuccess)
{
for (int i = 0; i < horizontalCombinationCount; ++i) {
for (int j = 0; j < verticalCombinationCount; ++j) {
if (!encodeDecode(/*columns=*/columnsCellWidths[i][0],
/*rows=*/rowsCellHeights[j][0],
/*cellWidth=*/columnsCellWidths[i][1],
/*cellHeight=*/rowsCellHeights[j][1],
yuvFormat,
expected_success)) {
if (!encodeDecodeDepthsAlpha(/*columns=*/columnsCellWidths[i][0],
/*rows=*/rowsCellHeights[j][0],
/*cellWidth=*/columnsCellWidths[i][1],
/*cellHeight=*/rowsCellHeights[j][1],
yuvFormat,
expectedSuccess)) {
return AVIF_FALSE;
}
}
Expand All @@ -177,7 +211,7 @@ int main(void)
validCellCountsSizes,
validCellCountsSizeCount,
yuvFormat,
/*expected_success=*/AVIF_TRUE)) {
/*expectedSuccess=*/AVIF_TRUE)) {
return EXIT_FAILURE;
}

Expand All @@ -186,35 +220,35 @@ int main(void)
invalidCellCountsSizes,
invalidCellCountsSizeCount,
yuvFormat,
/*expected_success=*/AVIF_FALSE) ||
/*expectedSuccess=*/AVIF_FALSE) ||
!encodeDecodeSizes(invalidCellCountsSizes,
invalidCellCountsSizeCount,
validCellCountsSizes,
validCellCountsSizeCount,
yuvFormat,
/*expected_success=*/AVIF_FALSE) ||
/*expectedSuccess=*/AVIF_FALSE) ||
!encodeDecodeSizes(invalidCellCountsSizes,
invalidCellCountsSizeCount,
invalidCellCountsSizes,
invalidCellCountsSizeCount,
yuvFormat,
/*expected_success=*/AVIF_FALSE)) {
/*expectedSuccess=*/AVIF_FALSE)) {
return EXIT_FAILURE;
}

// Special case depending on the cell count and the chroma subsampling.
for (int rows = 1; rows <= 2; ++rows) {
int expected_success = (rows == 1) || (yuvFormat != AVIF_PIXEL_FORMAT_YUV420);
if (!encodeDecode(/*columns=*/1, rows, /*cellWidth=*/64, /*cellHeight=*/65, yuvFormat, expected_success)) {
avifBool expectedSuccess = (rows == 1) || (yuvFormat != AVIF_PIXEL_FORMAT_YUV420);
if (!encodeDecodeDepthsAlpha(/*columns=*/1, rows, /*cellWidth=*/64, /*cellHeight=*/65, yuvFormat, expectedSuccess)) {
return EXIT_FAILURE;
}
}

// Special case depending on the cell count and the cell size.
for (int columns = 1; columns <= 2; ++columns) {
for (int rows = 1; rows <= 2; ++rows) {
int expected_success = (columns * rows == 1);
if (!encodeDecode(columns, rows, /*cellWidth=*/1, /*cellHeight=*/65, yuvFormat, expected_success)) {
avifBool expectedSuccess = (columns * rows == 1);
if (!encodeDecodeDepthsAlpha(columns, rows, /*cellWidth=*/1, /*cellHeight=*/65, yuvFormat, expectedSuccess)) {
return EXIT_FAILURE;
}
}
Expand Down