virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

jpeg2000: Drop unused and writeonly fields

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer
2013-07-01 10:01:10 +02:00
committed by Luca Barbato
parent ac921338a4
commit 86a2602e16
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000.h
View File

@@ -136,8 +136,6 @@ typedef struct Jpeg2000CodingStyle {
log2_cblk_height; // exponent of codeblock size log2_cblk_height; // exponent of codeblock size
uint8_t transform; // DWT type uint8_t transform; // DWT type
uint8_t csty; // coding style uint8_t csty; // coding style
uint8_t log2_prec_width,
log2_prec_height; // precinct size
uint8_t nlayers; // number of layers uint8_t nlayers; // number of layers
uint8_t mct; // multiple component transformation uint8_t mct; // multiple component transformation
uint8_t cblk_style; // codeblock coding style uint8_t cblk_style; // codeblock coding style
@@ -172,7 +170,6 @@ typedef struct Jpeg2000Cblk {
} Jpeg2000Cblk; // code block } Jpeg2000Cblk; // code block
typedef struct Jpeg2000Prec { typedef struct Jpeg2000Prec {
uint16_t xi0, yi0; // codeblock indexes ([xi0, xi1))
uint16_t nb_codeblocks_width; uint16_t nb_codeblocks_width;
uint16_t nb_codeblocks_height; uint16_t nb_codeblocks_height;
Jpeg2000TgtNode *zerobits; Jpeg2000TgtNode *zerobits;
@@ -186,7 +183,6 @@ typedef struct Jpeg2000Prec {
typedef struct Jpeg2000Band { typedef struct Jpeg2000Band {
uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
uint16_t log2_cblk_width, log2_cblk_height; uint16_t log2_cblk_width, log2_cblk_height;
uint16_t cblknx, cblkny;
float stepsize; // quantization stepsize float stepsize; // quantization stepsize
Jpeg2000Prec *prec; Jpeg2000Prec *prec;
} Jpeg2000Band; // subband } Jpeg2000Band; // subband

8
libavcodec/jpeg2000dec.c
View File

@@ -318,6 +318,9 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx
c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy
} }
} else {
memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths ));
memset(c->log2_prec_heights, 15, sizeof(c->log2_prec_heights));
} }
return 0; return 0;
} }
@@ -332,9 +335,6 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c,
if (bytestream2_get_bytes_left(&s->g) < 5) if (bytestream2_get_bytes_left(&s->g) < 5)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
tmp.log2_prec_width =
tmp.log2_prec_height = 15;
tmp.csty = bytestream2_get_byteu(&s->g); tmp.csty = bytestream2_get_byteu(&s->g);
// get progression order // get progression order
@@ -650,8 +650,6 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
if (band->coord[0][0] == band->coord[0][1] || if (band->coord[0][0] == band->coord[0][1] ||
band->coord[1][0] == band->coord[1][1]) band->coord[1][0] == band->coord[1][1])
continue; continue;
prec->yi0 = 0;
prec->xi0 = 0;
nb_code_blocks = prec->nb_codeblocks_height * nb_code_blocks = prec->nb_codeblocks_height *
prec->nb_codeblocks_width; prec->nb_codeblocks_width;
for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {