From be3271009ef893fbed9640e8edbd771685fd957b Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 1 Jul 2013 10:01:00 +0200 Subject: jpeg2000: Define the maximum decomposition levels And define the resolution levels according. Signed-off-by: Luca Barbato --- libavcodec/jpeg2000.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libavcodec/jpeg2000.h') diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 1e46f073ec..9282dd50a5 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -67,7 +67,9 @@ enum Jpeg2000Quantsty { // quantization style #define JPEG2000_MAX_CBLKW 64 #define JPEG2000_MAX_CBLKH 64 -#define JPEG2000_MAX_RESLEVELS 33 + +#define JPEG2000_MAX_DECLEVELS 32 +#define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1) // T1 flags // flags determining significance of neighbor coefficients @@ -145,8 +147,8 @@ typedef struct Jpeg2000CodingStyle { } Jpeg2000CodingStyle; typedef struct Jpeg2000QuantStyle { - uint8_t expn[32 * 3]; // quantization exponent - uint32_t mant[32 * 3]; // quantization mantissa + uint8_t expn[JPEG2000_MAX_DECLEVELS * 3]; // quantization exponent + uint32_t mant[JPEG2000_MAX_DECLEVELS * 3]; // quantization mantissa uint8_t quantsty; // quantization style uint8_t nguardbits; // number of guard bits } Jpeg2000QuantStyle; -- cgit v1.2.3