Browse Source

j2kdec: Try to fix 8bps output case

Ive no test samples for which this makes a difference but it
matches the 16bit implementation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
f0a2c8285a
1 changed files with 4 additions and 6 deletions
  1. +4
    -6
      libavcodec/j2kdec.c

+ 4
- 6
libavcodec/j2kdec.c View File

@@ -933,12 +933,10 @@ static int decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
dst = line + x * s->ncomponents + compno;

for (; x < tile->comp[compno].coord[0][1] - s->image_offset_x; x += s->cdx[compno]) {
*src[compno] += 1 << (s->cbps[compno]-1);
if (*src[compno] < 0)
*src[compno] = 0;
else if (*src[compno] >= (1 << s->cbps[compno]))
*src[compno] = (1 << s->cbps[compno]) - 1;
*dst = *src[compno]++;
int val = *src[compno]++ << (8 - s->cbps[compno]);
val += 1 << 7;
val = av_clip(val, 0, (1 << 8) - 1);
*dst = val;
dst += s->ncomponents;
}
line += s->picture->linesize[0];


Loading…
Cancel
Save