generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/exr: fix decoding of B44 exr when all channel doesnt have the same pixel type

Browse Source
This commit is contained in:
Martin Vignali 2016-06-04 15:43:48 +02:00 committed by Paul B Mahol
parent df7cd4176a
commit bc1f3dfaa3
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/exr.c
View File

@ -930,6 +930,7 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
int indexHgX, indexHgY, indexOut, indexTmp; int indexHgX, indexHgY, indexOut, indexTmp;
uint16_t tmpBuffer[16]; /* B44 use 4x4 half float pixel */ uint16_t tmpBuffer[16]; /* B44 use 4x4 half float pixel */
int c, iY, iX, y, x; int c, iY, iX, y, x;
int target_channel_offset = 0;
/* calc B44 block count */ /* calc B44 block count */
nbB44BlockW = td->xsize / 4; nbB44BlockW = td->xsize / 4;
@ -943,6 +944,7 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
for (c = 0; c < s->nb_channels; c++) { for (c = 0; c < s->nb_channels; c++) {
for (iY = 0; iY < nbB44BlockH; iY++) { for (iY = 0; iY < nbB44BlockH; iY++) {
for (iX = 0; iX < nbB44BlockW; iX++) {/* For each B44 block */ for (iX = 0; iX < nbB44BlockW; iX++) {/* For each B44 block */
if (s->channels[c].pixel_type == EXR_HALF) {/* B44 only compress half float data */
if (stayToUncompress < 3) { if (stayToUncompress < 3) {
av_log(s, AV_LOG_ERROR, "Not enough data for B44A block: %d", stayToUncompress); av_log(s, AV_LOG_ERROR, "Not enough data for B44A block: %d", stayToUncompress);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -968,15 +970,29 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
for (y = indexHgY; y < FFMIN(indexHgY + 4, td->ysize); y++) { for (y = indexHgY; y < FFMIN(indexHgY + 4, td->ysize); y++) {
for (x = indexHgX; x < FFMIN(indexHgX + 4, td->xsize); x++) { for (x = indexHgX; x < FFMIN(indexHgX + 4, td->xsize); x++) {
indexOut = (c * td->xsize + y * td->xsize * s->nb_channels + x) * 2; indexOut = target_channel_offset * td->xsize + y * td->channel_line_size + 2 * x;
indexTmp = (y-indexHgY) * 4 + (x-indexHgX); indexTmp = (y-indexHgY) * 4 + (x-indexHgX);
td->uncompressed_data[indexOut] = tmpBuffer[indexTmp] & 0xff; td->uncompressed_data[indexOut] = tmpBuffer[indexTmp] & 0xff;
td->uncompressed_data[indexOut + 1] = tmpBuffer[indexTmp] >> 8; td->uncompressed_data[indexOut + 1] = tmpBuffer[indexTmp] >> 8;
} }
} }
} else{/* Float or UINT 32 channel */
for (y = indexHgY; y < FFMIN(indexHgY + 4, td->ysize); y++) {
for (x = indexHgX; x < FFMIN(indexHgX + 4, td->xsize); x++) {
indexOut = target_channel_offset * td->xsize + y * td->channel_line_size + 4 * x;
memcpy(&td->uncompressed_data[indexOut], sr, 4);
sr += 4;
} }
} }
} }
}
}
if (s->channels[c].pixel_type == EXR_HALF) {
target_channel_offset += 2;
} else {
target_channel_offset += 4;
}
}
return 0; return 0;
} }