Commit 03152e74 authored by Martin Vignali's avatar Martin Vignali Committed by Paul B Mahol

avcodec/exr: improve pxr24 uncompress

Fix pxr24 uncompress when all channels doesnt have the same pixel type.
The expected length after zip decoding, is now calculated channel by channel.
parent 16107aea
...@@ -805,15 +805,20 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src, ...@@ -805,15 +805,20 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src,
int compressed_size, int uncompressed_size, int compressed_size, int uncompressed_size,
EXRThreadData *td) EXRThreadData *td)
{ {
unsigned long dest_len, expected_len; unsigned long dest_len, expected_len = 0;
const uint8_t *in = td->tmp; const uint8_t *in = td->tmp;
uint8_t *out; uint8_t *out;
int c, i, j; int c, i, j;
if (s->pixel_type == EXR_FLOAT) for (i = 0; i < s->nb_channels; i++) {
expected_len = (uncompressed_size / 4) * 3; /* PRX 24 store float in 24 bit instead of 32 */ if (s->channels[i].pixel_type == EXR_FLOAT) {
else expected_len += (td->xsize * td->ysize * 3);/* PRX 24 store float in 24 bit instead of 32 */
expected_len = uncompressed_size; } else if (s->channels[i].pixel_type == EXR_HALF) {
expected_len += (td->xsize * td->ysize * 2);
} else {//UINT 32
expected_len += (td->xsize * td->ysize * 4);
}
}
dest_len = expected_len; dest_len = expected_len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment