RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/exr: fix reading float channel when there is half and float channels in a file

This commit is contained in:
Martin Vignali 2016-06-25 17:56:03 +02:00 committed by Paul B Mahol
parent 6bcb1e1aff
commit 1e38791b7f
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/exr.c
View File

@ -942,9 +942,9 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
nbB44BlockH++;
for (c = 0; c < s->nb_channels; c++) {
for (iY = 0; iY < nbB44BlockH; iY++) {
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 (s->channels[c].pixel_type == EXR_HALF) {/* B44 only compress half float data */
for (iY = 0; iY < nbB44BlockH; iY++) {
for (iX = 0; iX < nbB44BlockW; iX++) {/* For each B44 block */
if (stayToUncompress < 3) {
av_log(s, AV_LOG_ERROR, "Not enough data for B44A block: %d", stayToUncompress);
return AVERROR_INVALIDDATA;
@ -976,20 +976,15 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
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 {
} else {/* Float or UINT 32 channel */
for (y = 0; y < td->ysize; y++) {
indexOut = target_channel_offset * td->xsize + y * td->channel_line_size;
memcpy(&td->uncompressed_data[indexOut], sr, td->xsize * 4);
sr += td->xsize * 4;
}
target_channel_offset += 4;
}
}