virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

jpeg2000dec: simplify init_tile() / merge from j2k

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-30 19:46:39 +02:00
parent f468325d34
commit 7a2b634220
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/jpeg2000dec.c
View File

@@ -518,8 +518,6 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno)
int tilex = tileno % s->numXtiles;
int tiley = tileno / s->numXtiles;
Jpeg2000Tile *tile = s->tile + tileno;
Jpeg2000CodingStyle *codsty;
Jpeg2000QuantStyle *qntsty;
if (!tile->comp)
return AVERROR(ENOMEM);
@@ -527,14 +525,14 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno)
/* copy codsty, qnsty to tile. TODO: Is it the best way?
* codsty, qnsty is an array of 4 structs Jpeg2000CodingStyle
* and Jpeg2000QuantStyle */
memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(*codsty));
memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(*qntsty));
memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(*tile->codsty));
memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(*tile->qntsty));
for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
Jpeg2000QuantStyle *qntsty = tile->qntsty + compno;
int ret; // global bandno
codsty = tile->codsty + compno;
qntsty = tile->qntsty + compno;
comp->coord_o[0][0] = FFMAX(tilex * s->tile_width + s->tile_offset_x, s->image_offset_x);
comp->coord_o[0][1] = FFMIN((tilex + 1) * s->tile_width + s->tile_offset_x, s->width);