Hello,
In attach patchs to fix decoding error, when all channels doesn't have the
same pixel type.
001 : Fix tile, and simplify the tile support (remove unneed reorganisation
of pixel).
002 : remove scanline_size var, is now replace by the same calc for tile
and scanline
003 : Fix PXR24 uncompress, to manage several pixel type. expected_len, is
now calculate channel by channel.
I don't think this code have a lot of interest to be share with other
compressor. PXR24, is the only compressor, where the float data, doesn't
have the size of a float.
For now, theses patchs, fix decoding tile whith half channel and float
channel for :
uncompress, rle, zip, zips, pxr24, piz.
And fix decoding PXR24 scanline.
But doesn't fix B44/B44a uncompress when all channels doesn't have the same
pixel type (but it's related to other issues).
Some samples with half and float channel can be found here :
https://we.tl/iN2zKNWlzB
Theses patch also pass fate test.
Comments welcome
Martin Vignali
Jokyo Images
From 5f781658e5eee14114080389662764c457abd924 Mon Sep 17 00:00:00 2001
From: Martin Vignali <martin.vign...@gmail.com>
Date: Sat, 4 Jun 2016 14:06:39 +0200
Subject: [PATCH 1/3] libavcodec/exr : fix tile decoding when all channels
doesnt have the same pixel type. also simplify the tile code, sharing more
code with the scanline mode.
---
libavcodec/exr.c | 65 +++++++++++++++++---------------------------------------
1 file changed, 19 insertions(+), 46 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 2c4f15e..93265a1 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -984,12 +984,11 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
const uint8_t *channel_buffer[4] = { 0 };
const uint8_t *buf = s->buf;
uint64_t line_offset, uncompressed_size;
- uint32_t xdelta = s->xdelta;
uint16_t *ptr_x;
uint8_t *ptr;
uint32_t data_size, line, col = 0;
uint32_t tileX, tileY, tileLevelX, tileLevelY;
- int channelLineSize, indexSrc, tX, tY, tCh;
+ int channel_line_size;
const uint8_t *src;
int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components; /* nb pixel to add at the right of the datawindow */
int bxmin = s->xmin * 2 * s->desc->nb_components; /* nb pixel to add at the left of the datawindow */
@@ -1025,14 +1024,16 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tileY * s->tile_attr.ySize);
td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tileX * s->tile_attr.xSize);
- uncompressed_size = s->current_channel_offset * (uint64_t)td->ysize * td->xsize;
if (col) { /* not the first tile of the line */
- bxmin = 0; axmax = 0; /* doesn't add pixel at the left of the datawindow */
+ bxmin = 0; /* doesn't add pixel at the left of the datawindow */
}
if ((col + td->xsize) != s->xdelta)/* not the last tile of the line */
axmax = 0; /* doesn't add pixel at the right of the datawindow */
+
+ channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */
+ uncompressed_size = channel_line_size * (uint64_t)td->ysize;/* uncompress size of the block */
} else {
if (line_offset > buf_size - 8)
return AVERROR_INVALIDDATA;
@@ -1049,7 +1050,10 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
td->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1); /* s->ydelta - line ?? */
td->xsize = s->xdelta;
- uncompressed_size = s->scan_line_size * td->ysize;
+
+ channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */
+ uncompressed_size = channel_line_size * (uint64_t)td->ysize;/* uncompress size of the block */
+
if ((s->compression == EXR_RAW && (data_size != uncompressed_size ||
line_offset > buf_size - uncompressed_size)) ||
(s->compression != EXR_RAW && (data_size > uncompressed_size ||
@@ -1098,34 +1102,11 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
src = td->uncompressed_data;
}
- if (s->is_tile) {
- indexSrc = 0;
- channelLineSize = td->xsize * 2;
- if (s->pixel_type == EXR_FLOAT)
- channelLineSize *= 2;
-
- /* reorganise tile data to have each channel one after the other instead of line by line */
- for (tY = 0; tY < td->ysize; tY ++) {
- for (tCh = 0; tCh < s->nb_channels; tCh++) {
- for (tX = 0; tX < channelLineSize; tX++) {
- td->tmp[tCh * channelLineSize * td->ysize + tY * channelLineSize + tX] = src[indexSrc];
- indexSrc++;
- }
- }
- }
-
- channel_buffer[0] = td->tmp + td->xsize * s->channel_offsets[0] * td->ysize;
- channel_buffer[1] = td->tmp + td->xsize * s->channel_offsets[1] * td->ysize;
- channel_buffer[2] = td->tmp + td->xsize * s->channel_offsets[2] * td->ysize;
- if (s->channel_offsets[3] >= 0)
- channel_buffer[3] = td->tmp + td->xsize * s->channel_offsets[3];
- } else {
- channel_buffer[0] = src + xdelta * s->channel_offsets[0];
- channel_buffer[1] = src + xdelta * s->channel_offsets[1];
- channel_buffer[2] = src + xdelta * s->channel_offsets[2];
- if (s->channel_offsets[3] >= 0)
- channel_buffer[3] = src + xdelta * s->channel_offsets[3];
- }
+ channel_buffer[0] = src + td->xsize * s->channel_offsets[0];
+ channel_buffer[1] = src + td->xsize * s->channel_offsets[1];
+ channel_buffer[2] = src + td->xsize * s->channel_offsets[2];
+ if (s->channel_offsets[3] >= 0)
+ channel_buffer[3] = src + td->xsize * s->channel_offsets[3];
ptr = p->data[0] + line * p->linesize[0] + (col * s->desc->nb_components * 2);
@@ -1200,19 +1181,11 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
// Zero out the end if xmax+1 is not w
memset(ptr_x, 0, axmax);
- if (s->is_tile) {
- channel_buffer[0] += channelLineSize;
- channel_buffer[1] += channelLineSize;
- channel_buffer[2] += channelLineSize;
- if (channel_buffer[3])
- channel_buffer[3] += channelLineSize;
- } else {
- channel_buffer[0] += s->scan_line_size;
- channel_buffer[1] += s->scan_line_size;
- channel_buffer[2] += s->scan_line_size;
- if (channel_buffer[3])
- channel_buffer[3] += s->scan_line_size;
- }
+ channel_buffer[0] += channel_line_size;
+ channel_buffer[1] += channel_line_size;
+ channel_buffer[2] += channel_line_size;
+ if (channel_buffer[3])
+ channel_buffer[3] += channel_line_size;
}
return 0;
--
1.9.3 (Apple Git-50)
From 5dfc8933492bbaebe763fa725330b721566f17bf Mon Sep 17 00:00:00 2001
From: Martin Vignali <martin.vign...@gmail.com>
Date: Sat, 4 Jun 2016 14:18:48 +0200
Subject: [PATCH 2/3] libavcodec/exr : remove unneed scanline_size var.
---
libavcodec/exr.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 93265a1..679d3e6 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -122,7 +122,6 @@ typedef struct EXRContext {
uint32_t ymax, ymin;
uint32_t xdelta, ydelta;
- uint64_t scan_line_size;
int scan_lines_per_block;
EXRTileAttribute tile_attr; /* header data attribute of tile */
@@ -1515,8 +1514,6 @@ static int decode_header(EXRContext *s)
}
}
- s->scan_line_size = s->xdelta * s->current_channel_offset;
-
if (bytestream2_get_bytes_left(&s->gb) <= 0) {
av_log(s->avctx, AV_LOG_ERROR, "Incomplete frame.\n");
return AVERROR_INVALIDDATA;
--
1.9.3 (Apple Git-50)
From 18b2d1dea11cd1887d1053e6110c431f20e17e3a Mon Sep 17 00:00:00 2001
From: Martin Vignali <martin.vign...@gmail.com>
Date: Sat, 4 Jun 2016 14:24:08 +0200
Subject: [PATCH 3/3] libavcodec/exr : fix pxr24 uncompress when all channels
doesnt have the same pixel type. the expected length after zip decoding, is
now calculate channel by channel.
---
libavcodec/exr.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 679d3e6..d4dda03 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -805,15 +805,20 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src,
int compressed_size, int uncompressed_size,
EXRThreadData *td)
{
- unsigned long dest_len, expected_len;
+ unsigned long dest_len, expected_len = 0;
const uint8_t *in = td->tmp;
uint8_t *out;
int c, i, j;
- if (s->pixel_type == EXR_FLOAT)
- expected_len = (uncompressed_size / 4) * 3; /* PRX 24 store float in 24 bit instead of 32 */
- else
- expected_len = uncompressed_size;
+ for (i = 0; i < s->nb_channels; i++) {
+ if (s->channels[i].pixel_type == EXR_FLOAT) {
+ expected_len += (td->xsize * td->ysize * 3);/* PRX 24 store float in 24 bit instead of 32 */
+ } 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;
--
1.9.3 (Apple Git-50)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
