mirror of https://git.videolan.org/git/ffmpeg.git
avcodec/jpeg2000: Support 32 decomposition levels
Fixes Ticket4680 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
d62657eb4a
commit
317be53ca6
|
@ -363,7 +363,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
|
||||||
/* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */
|
/* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */
|
||||||
band->coord[i][j] =
|
band->coord[i][j] =
|
||||||
ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] -
|
ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] -
|
||||||
(((bandno + 1 >> i) & 1) << declvl - 1),
|
(((bandno + 1 >> i) & 1LL) << declvl - 1),
|
||||||
declvl);
|
declvl);
|
||||||
/* TODO: Manage case of 3 band offsets here or
|
/* TODO: Manage case of 3 band offsets here or
|
||||||
* in coding/decoding function? */
|
* in coding/decoding function? */
|
||||||
|
|
|
@ -67,7 +67,7 @@ enum Jpeg2000Quantsty { // quantization style
|
||||||
JPEG2000_QSTY_SE // scalar expounded
|
JPEG2000_QSTY_SE // scalar expounded
|
||||||
};
|
};
|
||||||
|
|
||||||
#define JPEG2000_MAX_DECLEVELS 32
|
#define JPEG2000_MAX_DECLEVELS 33
|
||||||
#define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1)
|
#define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1)
|
||||||
|
|
||||||
#define JPEG2000_MAX_PASSES 100
|
#define JPEG2000_MAX_PASSES 100
|
||||||
|
|
Loading…
Reference in New Issue