MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavcodec/jpeg2000dec.c: Add support for PPT marker

Browse Source 
This patch adds functional changes to support the
PPT marker. This patch fixes bug ticket #4610.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Gautam Ramakrishnan 2020-04-07 22:27:13 +05:30 committed by Michael Niedermayer
parent cd04bb4afe
commit e531891f3d
1 changed files with 80 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
libavcodec/jpeg2000dec.c
View File

@ -83,6 +83,10 @@ typedef struct Jpeg2000Tile {
Jpeg2000QuantStyle qntsty[4];
Jpeg2000POC poc;
Jpeg2000TilePart tile_part[32];
uint8_t has_ppt; // whether this tile has a ppt marker
uint8_t *packed_headers; // contains packed headers. Used only along with PPT marker
int packed_headers_size; // size in bytes of the packed headers
GetByteContext packed_headers_stream; // byte context corresponding to packed headers
uint16_t tp_idx; // Tile-part index
int coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
} Jpeg2000Tile;
@ -855,6 +859,40 @@ static int get_plt(Jpeg2000DecoderContext *s, int n)
return 0;
}
static int get_ppt(Jpeg2000DecoderContext *s, int n)
{
Jpeg2000Tile *tile;
if (n < 3) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid length for PPT data.\n");
return AVERROR_INVALIDDATA;
}
if (s->curtileno < 0)
return AVERROR_INVALIDDATA;
tile = &s->tile[s->curtileno];
if (tile->tp_idx != 0) {
av_log(s->avctx, AV_LOG_ERROR,
"PPT marker can occur only on first tile part of a tile.\n");
return AVERROR_INVALIDDATA;
}
tile->has_ppt = 1; // this tile has a ppt marker
bytestream2_get_byte(&s->g); // Zppt is skipped and not used
void* new = av_realloc(tile->packed_headers,
tile->packed_headers_size + n - 3);
if (new) {
tile->packed_headers = new;
} else
return AVERROR(ENOMEM);
memcpy(tile->packed_headers + tile->packed_headers_size,
s->g.buffer, n - 3);
tile->packed_headers_size += n - 3;
bytestream2_skip(&s->g, n - 3);
return 0;
}
static int init_tile(Jpeg2000DecoderContext *s, int tileno)
{
int compno;
@ -927,6 +965,19 @@ static int getlblockinc(Jpeg2000DecoderContext *s)
return res;
}
static inline void select_stream(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
int *tp_index)
{
s->g = tile->tile_part[*tp_index].tpg;
if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) {
if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) {
s->g = tile->tile_part[++(*tp_index)].tpg;
}
}
if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES)
bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH);
}
static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int *tp_index,
Jpeg2000CodingStyle *codsty,
Jpeg2000ResLevel *rlevel, int precno,
@ -938,19 +989,15 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
if (layno < rlevel->band[0].prec[precno].decoded_layers)
return 0;
rlevel->band[0].prec[precno].decoded_layers = layno + 1;
if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) {
if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) {
s->g = tile->tile_part[++(*tp_index)].tpg;
}
}
if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES)
bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH);
// Select stream to read from
if (tile->has_ppt)
s->g = tile->packed_headers_stream;
else
select_stream(s, tile, tp_index);
if (!(ret = get_bits(s, 1))) {
jpeg2000_flush(s);
return 0;
goto skip_data;
} else if (ret < 0)
return ret;
@ -1056,6 +1103,11 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g));
}
// Save state of stream
if (tile->has_ppt) {
tile->packed_headers_stream = s->g;
select_stream(s, tile, tp_index);
}
for (bandno = 0; bandno < rlevel->nbands; bandno++) {
Jpeg2000Band *band = rlevel->band + bandno;
Jpeg2000Prec *prec = band->prec + precno;
@ -1097,6 +1149,15 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
av_freep(&cblk->lengthinc);
}
}
// Save state of stream
tile->tile_part[*tp_index].tpg = s->g;
return 0;
skip_data:
if (tile->has_ppt)
tile->packed_headers_stream = s->g;
else
tile->tile_part[*tp_index].tpg = s->g;
return 0;
}
@ -1929,6 +1990,11 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
av_log(s->avctx, AV_LOG_ERROR, "Invalid tpend\n");
return AVERROR_INVALIDDATA;
}
if (tile->has_ppt && tile->tp_idx == 0) {
bytestream2_init(&tile->packed_headers_stream, tile->packed_headers, tile->packed_headers_size);
}
bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer);
bytestream2_skip(&s->g, tp->tp_end - s->g.buffer);
@ -1995,6 +2061,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
// Packet length, tile-part header
ret = get_plt(s, len);
break;
case JPEG2000_PPT:
// Packed headers, tile-part header
ret = get_ppt(s, len);
break;
default:
av_log(s->avctx, AV_LOG_ERROR,
"unsupported marker 0x%.4"PRIX16" at pos 0x%X\n",
@ -2024,7 +2094,6 @@ static int jpeg2000_read_bitstream_packets(Jpeg2000DecoderContext *s)
if ((ret = init_tile(s, tileno)) < 0)
return ret;
s->g = tile->tile_part[0].tpg;
if ((ret = jpeg2000_decode_packets(s, tile)) < 0)
return ret;
}