diff options
Diffstat (limited to 'libavcodec/jpeg2000.h')
| -rw-r--r-- | libavcodec/jpeg2000.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 9282dd50a5..acdba62a07 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 */ @@ -130,14 +130,12 @@ 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 uint8_t csty; // coding style - uint8_t log2_prec_width, - log2_prec_height; // precinct size uint8_t nlayers; // number of layers uint8_t mct; // multiple component transformation uint8_t cblk_style; // codeblock coding style @@ -148,7 +146,7 @@ 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; @@ -172,7 +170,6 @@ typedef struct Jpeg2000Cblk { } Jpeg2000Cblk; // code block typedef struct Jpeg2000Prec { - uint16_t xi0, yi0; // codeblock indexes ([xi0, xi1)) uint16_t nb_codeblocks_width; uint16_t nb_codeblocks_height; Jpeg2000TgtNode *zerobits; @@ -181,13 +178,11 @@ typedef struct Jpeg2000Prec { uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} } Jpeg2000Prec; // precinct -/* TODO: stepsize can be float or integer depending on - * reversible or irreversible transformation. */ typedef struct Jpeg2000Band { uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} uint16_t log2_cblk_width, log2_cblk_height; - uint16_t cblknx, cblkny; - float stepsize; // quantization stepsize + int i_stepsize; // quantization stepsize + float f_stepsize; // quantization stepsize Jpeg2000Prec *prec; } Jpeg2000Band; // subband @@ -199,13 +194,11 @@ typedef struct Jpeg2000ResLevel { Jpeg2000Band *band; } Jpeg2000ResLevel; // resolution level -/* TODO: data can be float of integer depending of reversible/irreversible - * transformation. - */ typedef struct Jpeg2000Component { Jpeg2000ResLevel *reslevel; DWTContext dwt; - float *data; + float *f_data; + int *i_data; uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- can be reduced with lowres option uint16_t coord_o[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- original values from jpeg2000 headers } Jpeg2000Component; @@ -265,6 +258,8 @@ 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); #endif /* AVCODEC_JPEG2000_H */ |