diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 00:58:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 21:50:32 +0200 |
| commit | fc6de70c44be05eb0368ab519bfb790431d8dee5 (patch) | |
| tree | 41e4934bf2be0d1003556729f1360738723ed00a | |
| parent | 99de97cabf35c035b628943b865ab991583a6ea5 (diff) | |
| download | ffmpeg-fc6de70c44be05eb0368ab519bfb790431d8dee5.tar.gz | |
jpeg2000dec: Support non subsampled 8bit planar pixel formats
Fixes file2.jp2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5118e7b4f1..6959a3611f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1245,14 +1245,21 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int32_t *i_datap = comp->i_data; int cbps = s->cbps[compno]; int w = tile->comp[compno].coord[0][1] - s->image_offset_x; + int planar = !!picture->data[2]; + int pixelsize = planar ? 1 : s->ncomponents; + int plane = 0; + + if (planar) + plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1); + y = tile->comp[compno].coord[1][0] - s->image_offset_y; - line = picture->data[0] + y * picture->linesize[0]; + line = picture->data[plane] + y * picture->linesize[plane]; for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) { uint8_t *dst; x = tile->comp[compno].coord[0][0] - s->image_offset_x; - dst = line + x * s->ncomponents + compno; + dst = line + x * pixelsize + compno*!planar; if (codsty->transform == FF_DWT97) { for (; x < w; x += s->cdx[compno]) { @@ -1261,7 +1268,7 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, val = av_clip(val, 0, (1 << cbps) - 1); *dst = val << (8 - cbps); datap++; - dst += s->ncomponents; + dst += pixelsize; } } else { for (; x < w; x += s->cdx[compno]) { @@ -1270,10 +1277,10 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, val = av_clip(val, 0, (1 << cbps) - 1); *dst = val << (8 - cbps); i_datap++; - dst += s->ncomponents; + dst += pixelsize; } } - line += picture->linesize[0]; + line += picture->linesize[plane]; } } } else { |