Commit c72a8319 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/jpeg2000dec: Support progression order changes

Fixes Ticket4657
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2ec0ba1e
...@@ -391,6 +391,8 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, ...@@ -391,6 +391,8 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
Jpeg2000Prec *prec = band->prec + precno; Jpeg2000Prec *prec = band->prec + precno;
int nb_codeblocks; int nb_codeblocks;
prec->decoded_layers = 0;
/* TODO: Explain formula for JPEG200 DCINEMA. */ /* TODO: Explain formula for JPEG200 DCINEMA. */
/* TODO: Verify with previous count of codeblocks per band */ /* TODO: Verify with previous count of codeblocks per band */
......
...@@ -183,6 +183,7 @@ typedef struct Jpeg2000Prec { ...@@ -183,6 +183,7 @@ typedef struct Jpeg2000Prec {
Jpeg2000TgtNode *zerobits; Jpeg2000TgtNode *zerobits;
Jpeg2000TgtNode *cblkincl; Jpeg2000TgtNode *cblkincl;
Jpeg2000Cblk *cblk; Jpeg2000Cblk *cblk;
int decoded_layers;
uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
} Jpeg2000Prec; // precinct } Jpeg2000Prec; // precinct
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment