From d69976ced66ba6da885624b0589d670c896de17e Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sun, 23 Apr 2017 15:12:59 +0200 Subject: [PATCH 1/2] libavcodec/exr : fix piz on big endian --- libavcodec/exr.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 7194640..2104534 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -751,8 +751,12 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, uint16_t maxval, min_non_zero, max_non_zero; uint16_t *ptr; uint16_t *tmp = (uint16_t *)td->tmp; - uint8_t *out; + uint16_t *out; + uint16_t *in; int ret, i, j; +#if HAVE_BIGENDIAN + int p; +#endif int pixel_half_size;/* 1 for half, 2 for float and uint32 */ EXRChannel *channel; int tmp_offset; @@ -803,12 +807,11 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, apply_lut(td->lut, tmp, dsize / sizeof(uint16_t)); - out = td->uncompressed_data; + out = (uint16_t *)td->uncompressed_data; for (i = 0; i < td->ysize; i++) { tmp_offset = 0; for (j = 0; j < s->nb_channels; j++) { - uint16_t *in; - EXRChannel *channel = &s->channels[j]; + channel = &s->channels[j]; if (channel->pixel_type == EXR_HALF) pixel_half_size = 1; else @@ -816,8 +819,14 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, in = tmp + tmp_offset * td->xsize * td->ysize + i * td->xsize * pixel_half_size; tmp_offset += pixel_half_size; + +#if HAVE_BIGENDIAN + for (p = 0; p < td->xsize * pixel_half_size; p++) + out[p] = av_bswap16(in[p]); +#else memcpy(out, in, td->xsize * 2 * pixel_half_size); - out += td->xsize * 2 * pixel_half_size; +#endif + out += td->xsize * pixel_half_size; } } -- 1.9.3 (Apple Git-50)