virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/jpeg2000dec: Fix tp_index for POC

Browse Source 
Fixes Ticket2586

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-26 21:51:42 +02:00
parent c56ba5c270
commit b75c0a72ed
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/jpeg2000dec.c
View File

@@ -1033,12 +1033,11 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
int RSpoc, int CSpoc, int RSpoc, int CSpoc,
int LYEpoc, int REpoc, int CEpoc, int LYEpoc, int REpoc, int CEpoc,
int Ppoc) int Ppoc, int *tp_index)
{ {
int ret = 0; int ret = 0;
int layno, reslevelno, compno, precno, ok_reslevel; int layno, reslevelno, compno, precno, ok_reslevel;
int x, y; int x, y;
int tp_index = 0;
int step_x, step_y; int step_x, step_y;
switch (Ppoc) { switch (Ppoc) {
@@ -1056,7 +1055,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
reslevelno; reslevelno;
ok_reslevel = 1; ok_reslevel = 1;
for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++)
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, if ((ret = jpeg2000_decode_packet(s, tile, tp_index,
codsty, rlevel, codsty, rlevel,
precno, layno, precno, layno,
qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
@@ -1082,7 +1081,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
reslevelno; reslevelno;
ok_reslevel = 1; ok_reslevel = 1;
for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++)
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, if ((ret = jpeg2000_decode_packet(s, tile, tp_index,
codsty, rlevel, codsty, rlevel,
precno, layno, precno, layno,
qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
@@ -1142,7 +1141,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
} }
for (layno = 0; layno < LYEpoc; layno++) { for (layno = 0; layno < LYEpoc; layno++) {
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, codsty, rlevel, if ((ret = jpeg2000_decode_packet(s, tile, tp_index, codsty, rlevel,
precno, layno, precno, layno,
qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
qntsty->nguardbits)) < 0) qntsty->nguardbits)) < 0)
@@ -1213,7 +1212,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
} }
for (layno = 0; layno < LYEpoc; layno++) { for (layno = 0; layno < LYEpoc; layno++) {
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, if ((ret = jpeg2000_decode_packet(s, tile, tp_index,
codsty, rlevel, codsty, rlevel,
precno, layno, precno, layno,
qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
@@ -1280,7 +1279,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
} }
for (layno = 0; layno < LYEpoc; layno++) { for (layno = 0; layno < LYEpoc; layno++) {
if ((ret = jpeg2000_decode_packet(s, tile, &tp_index, codsty, rlevel, if ((ret = jpeg2000_decode_packet(s, tile, tp_index, codsty, rlevel,
precno, layno, precno, layno,
qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
qntsty->nguardbits)) < 0) qntsty->nguardbits)) < 0)
@@ -1302,6 +1301,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
{ {
int ret, i; int ret, i;
int tp_index = 0;
s->bit_index = 8; s->bit_index = 8;
if (tile->poc.nb_poc) { if (tile->poc.nb_poc) {
@@ -1310,7 +1310,7 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
ret = jpeg2000_decode_packets_po_iteration(s, tile, ret = jpeg2000_decode_packets_po_iteration(s, tile,
e->RSpoc, e->CSpoc, e->RSpoc, e->CSpoc,
e->LYEpoc, e->REpoc, e->CEpoc, e->LYEpoc, e->REpoc, e->CEpoc,
e->Ppoc e->Ppoc, &tp_index
); );
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -1321,7 +1321,8 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
tile->codsty[0].nlayers, tile->codsty[0].nlayers,
33, 33,
s->ncomponents, s->ncomponents,
tile->codsty[0].prog_order tile->codsty[0].prog_order,
&tp_index
); );
} }
/* EOC marker reached */ /* EOC marker reached */