external-repos/squoosh
1
0
Fork 1
mirror of https://github.com/GoogleChromeLabs/squoosh.git synced 2025-11-16 02:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HDR image support in AVIF decoder

Browse Source
This commit is contained in:
Surma
2020-02-05 17:12:03 -08:00
committed by Ingvar Stepanyan
parent 02807aab32
commit 409df481db
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
codecs/avif_dec/avif_dec.cpp
View File

@@ -56,16 +56,40 @@ RawImage decode(std::string avifimage) {
// ... image->rgbPlanes;
// ... image->rgbRowBytes;
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
int pixelOffset = y * image->width + x;
result[pixelOffset * 4 + 0] = image->rgbPlanes[0][pixelOffset];
result[pixelOffset * 4 + 1] = image->rgbPlanes[1][pixelOffset];
result[pixelOffset * 4 + 2] = image->rgbPlanes[2][pixelOffset];
if (image->alphaPlane) {
result[pixelOffset * 4 + 3] = image->alphaPlane[pixelOffset];
} else {
result[pixelOffset * 4 + 3] = 255;
if (image->depth > 8) {
uint16_t depthDivistor = 1 << (image->depth - 8);
// Plane ptrs are uint16_t*
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
int pixelOffset = y * image->width + x;
result[pixelOffset * 4 + 0] = (uint8_t)(
((uint16_t *)(image->rgbPlanes[0]))[pixelOffset] / depthDivistor);
result[pixelOffset * 4 + 1] = (uint8_t)(
((uint16_t *)(image->rgbPlanes[1]))[pixelOffset] / depthDivistor);
result[pixelOffset * 4 + 2] = (uint8_t)(
((uint16_t *)(image->rgbPlanes[2]))[pixelOffset] / depthDivistor);
if (image->alphaPlane) {
result[pixelOffset * 4 + 3] = (uint8_t)(
((uint16_t *)(image->alphaPlane))[pixelOffset] / depthDivistor);
} else {
result[pixelOffset * 4 + 3] = 255;
}
}
}
} else {
// Plane ptrs are uint8_t*
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
int pixelOffset = y * image->width + x;
result[pixelOffset * 4 + 0] = image->rgbPlanes[0][pixelOffset];
result[pixelOffset * 4 + 1] = image->rgbPlanes[1][pixelOffset];
result[pixelOffset * 4 + 2] = image->rgbPlanes[2][pixelOffset];
if (image->alphaPlane) {
result[pixelOffset * 4 + 3] = image->alphaPlane[pixelOffset];
} else {
result[pixelOffset * 4 + 3] = 255;
}
}
}
}