diff options
Diffstat (limited to 'libavcodec/jpeg2000.h')
-rw-r--r-- | libavcodec/jpeg2000.h | 66 |
1 files changed, 50 insertions, 16 deletions
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index b96b7e2..7a21c4e 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -3,20 +3,20 @@ * Copyright (c) 2007 Kamil Nowosad * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -58,19 +58,20 @@ enum Jpeg2000Markers { JPEG2000_EOC = 0xffd9, // end of codestream }; +#define JPEG2000_SOP_FIXED_BYTES 0xFF910004 +#define JPEG2000_SOP_BYTE_LENGTH 6 + enum Jpeg2000Quantsty { // quantization style JPEG2000_QSTY_NONE, // no quantization JPEG2000_QSTY_SI, // scalar derived JPEG2000_QSTY_SE // scalar expounded }; -#define JPEG2000_MAX_CBLKW 64 -#define JPEG2000_MAX_CBLKH 64 - - -#define JPEG2000_MAX_DECLEVELS 32 +#define JPEG2000_MAX_DECLEVELS 33 #define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1) +#define JPEG2000_MAX_PASSES 100 + // T1 flags // flags determining significance of neighbor coefficients #define JPEG2000_T1_SIG_N 0x0001 @@ -118,9 +119,10 @@ enum Jpeg2000Quantsty { // quantization style #define JPEG2000_PGOD_CPRL 0x04 // Component-position-resolution level-layer progression typedef struct Jpeg2000T1Context { - int data[JPEG2000_MAX_CBLKW][JPEG2000_MAX_CBLKH]; - int flags[JPEG2000_MAX_CBLKW + 2][JPEG2000_MAX_CBLKH + 2]; + int data[6144]; + uint16_t flags[6156]; MqcState mqc; + int stride; } Jpeg2000T1Context; typedef struct Jpeg2000TgtNode { @@ -130,8 +132,8 @@ typedef struct Jpeg2000TgtNode { } Jpeg2000TgtNode; typedef struct Jpeg2000CodingStyle { - uint8_t nreslevels; // number of resolution levels - uint8_t nreslevels2decode; // number of resolution levels to decode + int nreslevels; // number of resolution levels + int nreslevels2decode; // number of resolution levels to decode uint8_t log2_cblk_width, log2_cblk_height; // exponent of codeblock size uint8_t transform; // DWT type @@ -146,20 +148,32 @@ typedef struct Jpeg2000CodingStyle { typedef struct Jpeg2000QuantStyle { uint8_t expn[JPEG2000_MAX_DECLEVELS * 3]; // quantization exponent - uint32_t mant[JPEG2000_MAX_DECLEVELS * 3]; // quantization mantissa + uint16_t mant[JPEG2000_MAX_DECLEVELS * 3]; // quantization mantissa uint8_t quantsty; // quantization style uint8_t nguardbits; // number of guard bits } Jpeg2000QuantStyle; +typedef struct Jpeg2000Pass { + uint16_t rate; + int64_t disto; + uint8_t flushed[4]; + int flushed_len; +} Jpeg2000Pass; + typedef struct Jpeg2000Cblk { uint8_t npasses; uint8_t ninclpasses; // number coding of passes included in codestream uint8_t nonzerobits; uint16_t length; - uint16_t lengthinc; + uint16_t lengthinc[JPEG2000_MAX_PASSES]; + uint8_t nb_lengthinc; uint8_t lblock; uint8_t zero; uint8_t data[8192]; + int nb_terminations; + int nb_terminationsinc; + int data_start[JPEG2000_MAX_PASSES]; + Jpeg2000Pass passes[JPEG2000_MAX_PASSES]; uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} } Jpeg2000Cblk; // code block @@ -169,6 +183,7 @@ typedef struct Jpeg2000Prec { Jpeg2000TgtNode *zerobits; Jpeg2000TgtNode *cblkincl; Jpeg2000Cblk *cblk; + int decoded_layers; uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} } Jpeg2000Prec; // precinct @@ -200,7 +215,7 @@ typedef struct Jpeg2000Component { /* misc tools */ static inline int ff_jpeg2000_ceildivpow2(int a, int b) { - return (a + (1 << b) - 1) >> b; + return -(((int64_t)(-a)) >> b); } static inline int ff_jpeg2000_ceildiv(int a, int b) @@ -252,6 +267,25 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, int cbps, int dx, int dy, AVCodecContext *ctx); +void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty); + void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty); +static inline int needs_termination(int style, int passno) { + if (style & JPEG2000_CBLK_BYPASS) { + int type = passno % 3; + passno /= 3; + if (type == 0 && passno > 2) + return 2; + if (type == 2 && passno > 2) + return 1; + if (style & JPEG2000_CBLK_TERMALL) { + return passno > 2 ? 2 : 1; + } + } + if (style & JPEG2000_CBLK_TERMALL) + return 1; + return 0; +} + #endif /* AVCODEC_JPEG2000_H */ |