virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

libavcodec/exr : fix scanline offset table recreation on big endian

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Martin Vignali 2017-04-02 21:11:32 +02:00 committed by Michael Niedermayer
parent 08087f5462
commit 8163314967
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/exr.c
View File

@ -1648,9 +1648,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int y, ret; int y, ret;
int out_line_size; int out_line_size;
int nb_blocks; /* nb scanline or nb tile */ int nb_blocks; /* nb scanline or nb tile */
uint64_t *table; /* scanline offset table */ uint64_t start_offset_table;
uint8_t *marker; /* used to recreate invalid scanline offset table */ uint64_t start_next_scanline;
uint8_t *head; PutByteContext offset_table_writer;
bytestream2_init(&s->gb, avpkt->data, avpkt->size); bytestream2_init(&s->gb, avpkt->data, avpkt->size);
@ -1738,16 +1738,21 @@ static int decode_frame(AVCodecContext *avctx, void *data,
// check offset table and recreate it if need // check offset table and recreate it if need
if (!s->is_tile && bytestream2_peek_le64(&s->gb) == 0) { if (!s->is_tile && bytestream2_peek_le64(&s->gb) == 0) {
head = avpkt->data;
table = (uint64_t *)s->gb.buffer;
marker = head + bytestream2_tell(&s->gb) + nb_blocks * 8;
av_log(s->avctx, AV_LOG_DEBUG, "recreating invalid scanline offset table\n"); av_log(s->avctx, AV_LOG_DEBUG, "recreating invalid scanline offset table\n");
start_offset_table = bytestream2_tell(&s->gb);
start_next_scanline = start_offset_table + nb_blocks * 8;
bytestream2_init_writer(&offset_table_writer, &avpkt->data[start_offset_table], nb_blocks * 8);
for (y = 0; y < nb_blocks; y++) { for (y = 0; y < nb_blocks; y++) {
table[y] = marker - head; /* write offset of prev scanline in offset table */
marker += ((uint32_t *)marker)[1] + 8; bytestream2_put_le64(&offset_table_writer, start_next_scanline);
/* get len of next scanline */
bytestream2_seek(&s->gb, start_next_scanline + 4, SEEK_SET);/* skip line number */
start_next_scanline += (bytestream2_get_le32(&s->gb) + 8);
} }
bytestream2_seek(&s->gb, start_offset_table, SEEK_SET);
} }
// save pointer we are going to use in decode_block // save pointer we are going to use in decode_block