Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)
* commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
  jpeg2000: Improve reduced resolution decoding
  jpeg2000: Compute quantization for 'scalar derived' in the correct case.
  jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

diff --combined libavcodec/jpeg2000.c
@@@ -3,20 -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
   */
  
@@@ -25,7 -25,6 +25,7 @@@
   * JPEG 2000 image encoder and decoder common functions
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "libavutil/mem.h"
  #include "avcodec.h"
@@@ -41,7 -40,8 +41,7 @@@ static int32_t tag_tree_size(uint16_t w
      uint32_t res = 0;
      while (w > 1 || h > 1) {
          res += w * h;
 -        if (res + 1 >= INT32_MAX)
 -            return -1;
 +        av_assert0(res + 1 < INT32_MAX);
          w = (w + 1) >> 1;
          h = (h + 1) >> 1;
      }
@@@ -55,6 -55,8 +55,6 @@@ static Jpeg2000TgtNode *ff_jpeg2000_tag
      int32_t tt_size;
  
      tt_size = tag_tree_size(w, h);
 -    if (tt_size == -1)
 -        return NULL;
  
      t = res = av_mallocz_array(tt_size, sizeof(*t));
      if (!res)
      return res;
  }
  
 +static void tag_tree_zero(Jpeg2000TgtNode *t, int w, int h)
 +{
 +    int i, siz = tag_tree_size(w, h);
 +
 +    for (i = 0; i < siz; i++) {
 +        t[i].val = 0;
 +        t[i].vis = 0;
 +    }
 +}
 +
  uint8_t ff_jpeg2000_sigctxno_lut[256][4];
  
  static int getsigctxno(int flag, int bandno)
          ((flag & JPEG2000_T1_SIG_NW) ? 1 : 0) +
          ((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) +
          ((flag & JPEG2000_T1_SIG_SW) ? 1 : 0);
 +
      if (bandno < 3) {
          if (bandno == 1)
              FFSWAP(int, h, v);
 -        if (h == 2)
 -            return 8;
 +        if (h == 2) return 8;
          if (h == 1) {
 -            if (v >= 1)
 -                return 7;
 -            if (d >= 1)
 -                return 6;
 +            if (v >= 1) return 7;
 +            if (d >= 1) return 6;
              return 5;
          }
 -        if (v == 2)
 -            return 4;
 -        if (v == 1)
 -            return 3;
 -        if (d >= 2)
 -            return 2;
 -        if (d == 1)
 -            return 1;
 +        if (v == 2) return 4;
 +        if (v == 1) return 3;
 +        if (d >= 2) return 2;
 +        if (d == 1) return 1;
      } else {
 -        if (d >= 3)
 -            return 8;
 +        if (d >= 3) return 8;
          if (d == 2) {
 -            if (h + v >= 1)
 -                return 7;
 +            if (h+v >= 1) return 7;
              return 6;
          }
          if (d == 1) {
 -            if (h + v >= 2)
 -                return 5;
 -            if (h + v == 1)
 -                return 4;
 +            if (h+v >= 2) return 5;
 +            if (h+v == 1) return 4;
              return 3;
          }
 -        if (h + v >= 2)
 -            return 2;
 -        if (h + v == 1)
 -            return 1;
 +        if (h+v >= 2) return 2;
 +        if (h+v == 1) return 1;
      }
      return 0;
  }
@@@ -198,10 -202,10 +198,10 @@@ int ff_jpeg2000_init_component(Jpeg2000
  {
      uint8_t log2_band_prec_width, log2_band_prec_height;
      int reslevelno, bandno, gbandno = 0, ret, i, j;
 -    uint32_t csize = 1;
 +    uint32_t csize;
  
 -    if (!codsty->nreslevels2decode) {
 -        av_log(avctx, AV_LOG_ERROR, "nreslevels2decode uninitialized\n");
 +    if (codsty->nreslevels2decode <= 0) {
 +        av_log(avctx, AV_LOG_ERROR, "nreslevels2decode %d invalid or uninitialized\n", codsty->nreslevels2decode);
          return AVERROR_INVALIDDATA;
      }
  
      csize = (comp->coord[0][1] - comp->coord[0][0]) *
              (comp->coord[1][1] - comp->coord[1][0]);
  
 -    comp->data = av_malloc_array(csize, sizeof(*comp->data));
 -    if (!comp->data)
 -        return AVERROR(ENOMEM);
 +    if (codsty->transform == FF_DWT97) {
 +        comp->i_data = NULL;
 +        comp->f_data = av_malloc_array(csize, sizeof(*comp->f_data));
 +        if (!comp->f_data)
 +            return AVERROR(ENOMEM);
 +    } else {
 +        comp->f_data = NULL;
 +        comp->i_data = av_malloc_array(csize, sizeof(*comp->i_data));
 +        if (!comp->i_data)
 +            return AVERROR(ENOMEM);
 +    }
      comp->reslevel = av_malloc_array(codsty->nreslevels, sizeof(*comp->reslevel));
      if (!comp->reslevel)
          return AVERROR(ENOMEM);
                  /*TODO: Compute formula to implement. */
                  numbps = cbps +
                           lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)];
 -                band->stepsize = (float)SHL(2048 + qntsty->mant[gbandno],
 +                band->f_stepsize = SHL(2048 + qntsty->mant[gbandno],
                                              2 + numbps - qntsty->expn[gbandno]);
                  break;
              case JPEG2000_QSTY_SE:
                   * but it works (compared to OpenJPEG). Why?
                   * Further investigation needed. */
                  gain            = cbps;
 -                band->stepsize  = pow(2.0, gain - qntsty->expn[gbandno]);
 -                band->stepsize *= (float)qntsty->mant[gbandno] / 2048.0 + 1.0;
 +                band->f_stepsize  = pow(2.0, gain - qntsty->expn[gbandno]);
 +                band->f_stepsize *= qntsty->mant[gbandno] / 2048.0 + 1.0;
                  break;
              default:
 -                band->stepsize = 0;
 +                band->f_stepsize = 0;
                  av_log(avctx, AV_LOG_ERROR, "Unknown quantization format\n");
                  break;
              }
              /* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
-                 * If not set output of entropic decoder is not correct. */
+              * If not set output of entropic decoder is not correct. */
 -            band->stepsize *= 0.5;
 -            /* BITEXACT computing case --> convert to int */
 -            if (avctx->flags & CODEC_FLAG_BITEXACT)
 -                band->stepsize = (int32_t)(band->stepsize * (1 << 16));
 +            if (!av_codec_is_encoder(avctx->codec))
 +                band->f_stepsize *= 0.5;
 +
 +            band->i_stepsize = band->f_stepsize * (1 << 16);
  
              /* computation of tbx_0, tbx_1, tby_0, tby_1
               * see ISO/IEC 15444-1:2002 B.5 eq. B-15 and tbl B.1
                  for (i = 0; i < 2; i++)
                      for (j = 0; j < 2; j++)
                          band->coord[i][j] =
 -                            ff_jpeg2000_ceildivpow2(comp->coord_o[i][j],
 +                            ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0],
                                                      declvl - 1);
 -
                  log2_band_prec_width  = reslevel->log2_prec_width;
                  log2_band_prec_height = reslevel->log2_prec_height;
                  /* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */
                      for (j = 0; j < 2; j++)
                          /* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */
                          band->coord[i][j] =
 -                            ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] -
 +                            ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0] -
                                                      (((bandno + 1 >> i) & 1) << declvl - 1),
                                                      declvl);
                  /* TODO: Manage case of 3 band offsets here or
                  log2_band_prec_height = reslevel->log2_prec_height - 1;
              }
  
 +            for (j = 0; j < 2; j++)
 +                band->coord[0][j] = ff_jpeg2000_ceildiv(band->coord[0][j], dx);
 +            for (j = 0; j < 2; j++)
 +                band->coord[1][j] = ff_jpeg2000_ceildiv(band->coord[1][j], dy);
 +
              band->prec = av_malloc_array(reslevel->num_precincts_x *
 -                                         reslevel->num_precincts_y,
 +                                         (uint64_t)reslevel->num_precincts_y,
                                           sizeof(*band->prec));
              if (!band->prec)
                  return AVERROR(ENOMEM);
                      return AVERROR(ENOMEM);
  
                  prec->cblk = av_mallocz_array(prec->nb_codeblocks_width *
 -                                              prec->nb_codeblocks_height,
 +                                              (uint64_t)prec->nb_codeblocks_height,
                                                sizeof(*prec->cblk));
                  if (!prec->cblk)
                      return AVERROR(ENOMEM);
                      /* Compute Cy1 */
                      cblk->coord[1][1] = FFMIN(Cy0 + (1 << band->log2_cblk_height),
                                                prec->coord[1][1]);
-                     if((bandno + !!reslevelno) & 1) {
-                         cblk->coord[0][0] += comp->reslevel[reslevelno-1].coord[0][1] - comp->reslevel[reslevelno-1].coord[0][0];
-                         cblk->coord[0][1] += comp->reslevel[reslevelno-1].coord[0][1] - comp->reslevel[reslevelno-1].coord[0][0];
+                     /* Update code-blocks coordinates according sub-band position */
+                     if ((bandno + !!reslevelno) & 1) {
+                         cblk->coord[0][0] += comp->reslevel[reslevelno-1].coord[0][1] -
+                                              comp->reslevel[reslevelno-1].coord[0][0];
+                         cblk->coord[0][1] += comp->reslevel[reslevelno-1].coord[0][1] -
+                                              comp->reslevel[reslevelno-1].coord[0][0];
                      }
-                     if((bandno + !!reslevelno) & 2) {
-                         cblk->coord[1][0] += comp->reslevel[reslevelno-1].coord[1][1] - comp->reslevel[reslevelno-1].coord[1][0];
-                         cblk->coord[1][1] += comp->reslevel[reslevelno-1].coord[1][1] - comp->reslevel[reslevelno-1].coord[1][0];
+                     if ((bandno + !!reslevelno) & 2) {
+                         cblk->coord[1][0] += comp->reslevel[reslevelno-1].coord[1][1] -
+                                              comp->reslevel[reslevelno-1].coord[1][0];
+                         cblk->coord[1][1] += comp->reslevel[reslevelno-1].coord[1][1] -
+                                              comp->reslevel[reslevelno-1].coord[1][0];
                      }
  
                      cblk->zero      = 0;
      return 0;
  }
  
 +void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
 +{
 +    int reslevelno, bandno, cblkno, precno;
 +    for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) {
 +        Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
 +        for (bandno = 0; bandno < rlevel->nbands; bandno++) {
 +            Jpeg2000Band *band = rlevel->band + bandno;
 +            for(precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) {
 +                Jpeg2000Prec *prec = band->prec + precno;
 +                tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height);
 +                tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height);
 +                for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) {
 +                    Jpeg2000Cblk *cblk = prec->cblk + cblkno;
 +                    cblk->length = 0;
 +                    cblk->lblock = 3;
 +                }
 +            }
 +        }
 +    }
 +}
 +
  void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
  {
      int reslevelno, bandno, precno;
 -    for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) {
 +    for (reslevelno = 0; comp->reslevel && reslevelno < codsty->nreslevels; reslevelno++) {
          Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
  
          for (bandno = 0; bandno < reslevel->nbands; bandno++) {
  
      ff_dwt_destroy(&comp->dwt);
      av_freep(&comp->reslevel);
 -    av_freep(&comp->data);
 +    av_freep(&comp->i_data);
 +    av_freep(&comp->f_data);
  }
diff --combined libavcodec/jpeg2000dec.c
@@@ -3,20 -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
   */
  
@@@ -25,7 -25,6 +25,7 @@@
   * JPEG 2000 image decoder
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "libavutil/opt.h"
  #include "avcodec.h"
@@@ -42,8 -41,9 +42,8 @@@
  #define HAD_QCC 0x02
  
  typedef struct Jpeg2000TilePart {
 -    uint16_t tp_idx;                    // Tile-part index
      uint8_t tile_index;                 // Tile index who refers the tile-part
 -    uint32_t tp_len;                    // Length of tile-part
 +    const uint8_t *tp_end;
      GetByteContext tpg;                 // bit stream in tile-part
  } Jpeg2000TilePart;
  
@@@ -54,14 -54,13 +54,14 @@@ typedef struct Jpeg2000Tile 
      uint8_t             properties[4];
      Jpeg2000CodingStyle codsty[4];
      Jpeg2000QuantStyle  qntsty[4];
 -    Jpeg2000TilePart    tile_part[3];
 +    Jpeg2000TilePart    tile_part[4];
 +    uint16_t tp_idx;                    // Tile-part index
  } Jpeg2000Tile;
  
  typedef struct Jpeg2000DecoderContext {
      AVClass         *class;
      AVCodecContext  *avctx;
 -    GetByteContext g;
 +    GetByteContext  g;
  
      int             width, height;
      int             image_offset_x, image_offset_y;
  
      int             bit_index;
  
 -    int16_t         curtileno;
 +    int             curtileno;
 +
      Jpeg2000Tile    *tile;
  
      /*options parameters*/
-     int             lowres;
      int             reduction_factor;
  } Jpeg2000DecoderContext;
  
@@@ -97,7 -94,6 +96,7 @@@
  static int get_bits(Jpeg2000DecoderContext *s, int n)
  {
      int res = 0;
 +
      while (--n >= 0) {
          res <<= 1;
          if (s->bit_index == 0) {
@@@ -123,9 -119,6 +122,9 @@@ static int tag_tree_decode(Jpeg2000Deco
      Jpeg2000TgtNode *stack[30];
      int sp = -1, curval = 0;
  
 +    if (!node)
 +        return AVERROR(EINVAL);
 +
      while (node && !node->vis) {
          stack[++sp] = node;
          node        = node->parent;
@@@ -182,7 -175,7 +181,7 @@@ static int get_siz(Jpeg2000DecoderConte
          return AVERROR_INVALIDDATA;
      }
  
 -    if (ncomponents > 3) {
 +    if (ncomponents > 4) {
          avpriv_request_sample(s->avctx, "Support for %d components",
                                s->ncomponents);
          return AVERROR_PATCHWELCOME;
  
      s->ncomponents = ncomponents;
  
 -    if (s->tile_width <= 0 || s->tile_height <= 0 ||
 -        s->tile_width > s->width || s->tile_height > s->height) {
 +    if (s->tile_width <= 0 || s->tile_height <= 0) {
          av_log(s->avctx, AV_LOG_ERROR, "Invalid tile dimension %dx%d.\n",
                 s->tile_width, s->tile_height);
          return AVERROR_INVALIDDATA;
          s->sgnd[i]   = !!(x & 0x80);
          s->cdx[i]    = bytestream2_get_byteu(&s->g);
          s->cdy[i]    = bytestream2_get_byteu(&s->g);
 -
          if (s->cdx[i] != 1 || s->cdy[i] != 1) {
              avpriv_request_sample(s->avctx,
                                    "CDxy values %d %d for component %d",
                                    s->cdx[i], s->cdy[i], i);
              if (!s->cdx[i] || !s->cdy[i])
                  return AVERROR_INVALIDDATA;
 -            else
 -                return AVERROR_PATCHWELCOME;
          }
      }
  
      s->numXtiles = ff_jpeg2000_ceildiv(s->width  - s->tile_offset_x, s->tile_width);
      s->numYtiles = ff_jpeg2000_ceildiv(s->height - s->tile_offset_y, s->tile_height);
  
 +    if (s->numXtiles * (uint64_t)s->numYtiles > INT_MAX/sizeof(*s->tile)) {
 +        s->numXtiles = s->numYtiles = 0;
 +        return AVERROR(EINVAL);
 +    }
 +
      s->tile = av_mallocz_array(s->numXtiles * s->numYtiles, sizeof(*s->tile));
      if (!s->tile) {
          s->numXtiles = s->numYtiles = 0;
      s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y,
                                                 s->reduction_factor);
  
 -    switch (s->avctx->profile) {
 -    case FF_PROFILE_JPEG2000_DCINEMA_2K:
 -    case FF_PROFILE_JPEG2000_DCINEMA_4K:
 -        /* XYZ color-space for digital cinema profiles */
 -        s->avctx->pix_fmt = AV_PIX_FMT_XYZ12;
 +    switch(s->ncomponents) {
 +    case 1:
 +        if (s->precision > 8)
 +            s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
 +        else
 +            s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
          break;
 -    default:
 -        /* For other profiles selects color-space according number of
 -         * components and bit depth precision. */
 -        switch (s->ncomponents) {
 -        case 1:
 -            if (s->precision > 8)
 -                s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
 -            else
 -                s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
 +    case 3:
 +        switch (s->avctx->profile) {
 +        case FF_PROFILE_JPEG2000_DCINEMA_2K:
 +        case FF_PROFILE_JPEG2000_DCINEMA_4K:
 +            /* XYZ color-space for digital cinema profiles */
 +            s->avctx->pix_fmt = AV_PIX_FMT_XYZ12;
              break;
 -        case 3:
 +        default:
              if (s->precision > 8)
                  s->avctx->pix_fmt = AV_PIX_FMT_RGB48;
              else
                  s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
              break;
 -        case 4:
 -            s->avctx->pix_fmt = AV_PIX_FMT_BGRA;
 -            break;
 -        default:
 -            /* pixel format can not be identified */
 -            s->avctx->pix_fmt = AV_PIX_FMT_NONE;
 -            break;
          }
          break;
 +    case 4:
 +        s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
 +        break;
 +    default:
 +        /* pixel format can not be identified */
 +        s->avctx->pix_fmt = AV_PIX_FMT_NONE;
 +        break;
      }
      return 0;
  }
@@@ -287,10 -281,9 +286,10 @@@ static int get_cox(Jpeg2000DecoderConte
      /*  nreslevels = number of resolution levels
                     = number of decomposition level +1 */
      c->nreslevels = bytestream2_get_byteu(&s->g) + 1;
 -
 -    if (c->nreslevels > JPEG2000_MAX_RESLEVELS)
 +    if (c->nreslevels >= JPEG2000_MAX_RESLEVELS) {
 +        av_log(s->avctx, AV_LOG_ERROR, "nreslevels %d is invalid\n", c->nreslevels);
          return AVERROR_INVALIDDATA;
 +    }
  
      /* compute number of resolution levels to decode */
      if (c->nreslevels < s->reduction_factor)
      else
          c->nreslevels2decode = c->nreslevels - s->reduction_factor;
  
 -    c->log2_cblk_width  = bytestream2_get_byteu(&s->g) + 2; // cblk width
 -    c->log2_cblk_height = bytestream2_get_byteu(&s->g) + 2; // cblk height
 +    c->log2_cblk_width  = (bytestream2_get_byteu(&s->g) & 15) + 2; // cblk width
 +    c->log2_cblk_height = (bytestream2_get_byteu(&s->g) & 15) + 2; // cblk height
  
      if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
          c->log2_cblk_width + c->log2_cblk_height > 12) {
  
      c->cblk_style = bytestream2_get_byteu(&s->g);
      if (c->cblk_style != 0) { // cblk style
 -        avpriv_request_sample(s->avctx, "Support for extra cblk styles");
 -        return AVERROR_PATCHWELCOME;
 +        av_log(s->avctx, AV_LOG_WARNING, "extra cblk styles %X\n", c->cblk_style);
      }
      c->transform = bytestream2_get_byteu(&s->g); // DWT transformation type
      /* set integer 9/7 DWT in case of BITEXACT flag */
@@@ -409,7 -403,7 +408,7 @@@ static int get_qcx(Jpeg2000DecoderConte
      if (q->quantsty == JPEG2000_QSTY_NONE) {
          n -= 3;
          if (bytestream2_get_bytes_left(&s->g) < n ||
 -            n > JPEG2000_MAX_DECLEVELS)
 +            n > JPEG2000_MAX_DECLEVELS*3)
              return AVERROR_INVALIDDATA;
          for (i = 0; i < n; i++)
              q->expn[i] = bytestream2_get_byteu(&s->g) >> 3;
      } else {
          n = (n - 3) >> 1;
          if (bytestream2_get_bytes_left(&s->g) < 2 * n ||
 -            n > JPEG2000_MAX_DECLEVELS)
 +            n > JPEG2000_MAX_DECLEVELS*3)
              return AVERROR_INVALIDDATA;
          for (i = 0; i < n; i++) {
              x          = bytestream2_get_be16u(&s->g);
@@@ -487,12 -481,14 +486,12 @@@ static int get_sot(Jpeg2000DecoderConte
      if (bytestream2_get_bytes_left(&s->g) < 8)
          return AVERROR_INVALIDDATA;
  
 +    s->curtileno = 0;
      Isot = bytestream2_get_be16u(&s->g);        // Isot
      if (Isot >= s->numXtiles * s->numYtiles)
          return AVERROR_INVALIDDATA;
  
 -    if (Isot) {
 -        avpriv_request_sample(s->avctx, "Support for more than one tile");
 -        return AVERROR_PATCHWELCOME;
 -    }
 +    s->curtileno = Isot;
      Psot  = bytestream2_get_be32u(&s->g);       // Psot
      TPsot = bytestream2_get_byteu(&s->g);       // TPsot
  
          return AVERROR_PATCHWELCOME;
      }
  
 +    s->tile[s->curtileno].tp_idx = TPsot;
      tp             = s->tile[s->curtileno].tile_part + TPsot;
      tp->tile_index = Isot;
 -    tp->tp_len     = Psot;
 -    tp->tp_idx     = TPsot;
 -
 -    /* Start of bit stream. Pointer to SOD marker
 -     * Check SOD marker is present. */
 -    if (JPEG2000_SOD == bytestream2_get_be16(&s->g)) {
 -        bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_len - n - 4);
 -        bytestream2_skip(&s->g, tp->tp_len - n - 4);
 -    } else {
 -        av_log(s->avctx, AV_LOG_ERROR, "SOD marker not found \n");
 -        return AVERROR_INVALIDDATA;
 -    }
 +    tp->tp_end     = s->g.buffer + Psot - n - 2;
 +
 +    if (!TPsot) {
 +        Jpeg2000Tile *tile = s->tile + s->curtileno;
  
 -    /* End address of bit stream =
 -     *     start address + (Psot - size of SOT HEADER(n)
 -     *     - size of SOT MARKER(2)  - size of SOD marker(2) */
 +        /* copy defaults */
 +        memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(Jpeg2000CodingStyle));
 +        memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(Jpeg2000QuantStyle));
 +    }
  
      return 0;
  }
@@@ -573,15 -575,23 +572,15 @@@ static int init_tile(Jpeg2000DecoderCon
      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);
  
 -    /* 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));
 -
      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);
@@@ -706,12 -716,16 +705,12 @@@ static int jpeg2000_decode_packet(Jpeg2
          nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width;
          for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {
              Jpeg2000Cblk *cblk = prec->cblk + cblkno;
 -            if (bytestream2_get_bytes_left(&s->g) < cblk->lengthinc)
 +            if (   bytestream2_get_bytes_left(&s->g) < cblk->lengthinc
 +                || sizeof(cblk->data) < cblk->length + cblk->lengthinc + 2
 +            )
                  return AVERROR_INVALIDDATA;
 -            /* Code-block data can be empty. In that case initialize data
 -             * with 0xFFFF. */
 -            if (cblk->lengthinc > 0) {
 -                bytestream2_get_bufferu(&s->g, cblk->data, cblk->lengthinc);
 -            } else {
 -                cblk->data[0] = 0xFF;
 -                cblk->data[1] = 0xFF;
 -            }
 +
 +            bytestream2_get_bufferu(&s->g, cblk->data + cblk->length, cblk->lengthinc);
              cblk->length   += cblk->lengthinc;
              cblk->lengthinc = 0;
          }
  static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
  {
      int layno, reslevelno, compno, precno, ok_reslevel, ret;
 -    uint8_t prog_order = tile->codsty[0].prog_order;
 -    uint16_t x;
 -    uint16_t y;
 +    int x, y;
  
      s->bit_index = 8;
 -    switch (prog_order) {
 +    switch (tile->codsty[0].prog_order) {
      case JPEG2000_PGOD_LRCP:
 +    case JPEG2000_PGOD_RLCP:
          for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
              ok_reslevel = 1;
              for (reslevelno = 0; ok_reslevel; reslevelno++) {
                      Jpeg2000QuantStyle *qntsty  = tile->qntsty + compno;
                      if (reslevelno < codsty->nreslevels) {
                          Jpeg2000ResLevel *rlevel = tile->comp[compno].reslevel +
 -                                                   reslevelno;
 +                                                reslevelno;
                          ok_reslevel = 1;
                          for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++)
                              if ((ret = jpeg2000_decode_packet(s,
  
  /* TIER-1 routines */
  static void decode_sigpass(Jpeg2000T1Context *t1, int width, int height,
 -                           int bpno, int bandno)
 +                           int bpno, int bandno, int bpass_csty_symbol,
 +                           int vert_causal_ctx_csty_symbol)
  {
      int mask = 3 << (bpno - 1), y0, x, y;
  
      for (y0 = 0; y0 < height; y0 += 4)
          for (x = 0; x < width; x++)
 -            for (y = y0; y < height && y < y0 + 4; y++)
 -                if ((t1->flags[y + 1][x + 1] & JPEG2000_T1_SIG_NB)
 -                    && !(t1->flags[y + 1][x + 1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS))) {
 -                    if (ff_mqc_decode(&t1->mqc,
 -                                      t1->mqc.cx_states +
 -                                      ff_jpeg2000_getsigctxno(t1->flags[y + 1][x + 1],
 -                                                             bandno))) {
 -                        int xorbit, ctxno = ff_jpeg2000_getsgnctxno(t1->flags[y + 1][x + 1],
 -                                                                    &xorbit);
 -
 -                        t1->data[y][x] =
 -                            (ff_mqc_decode(&t1->mqc,
 -                                           t1->mqc.cx_states + ctxno) ^ xorbit)
 -                            ? -mask : mask;
 +            for (y = y0; y < height && y < y0 + 4; y++) {
 +                if ((t1->flags[y+1][x+1] & JPEG2000_T1_SIG_NB)
 +                && !(t1->flags[y+1][x+1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS))) {
 +                    int flags_mask = -1;
 +                    if (vert_causal_ctx_csty_symbol && y == y0 + 3)
 +                        flags_mask &= ~(JPEG2000_T1_SIG_S | JPEG2000_T1_SIG_SW | JPEG2000_T1_SIG_SE);
 +                    if (ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ff_jpeg2000_getsigctxno(t1->flags[y+1][x+1] & flags_mask, bandno))) {
 +                        int xorbit, ctxno = ff_jpeg2000_getsgnctxno(t1->flags[y+1][x+1], &xorbit);
 +                        if (bpass_csty_symbol)
 +                             t1->data[y][x] = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ctxno) ? -mask : mask;
 +                        else
 +                             t1->data[y][x] = (ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ctxno) ^ xorbit) ?
 +                                               -mask : mask;
  
                          ff_jpeg2000_set_significance(t1, x, y,
                                                       t1->data[y][x] < 0);
                      }
                      t1->flags[y + 1][x + 1] |= JPEG2000_T1_VIS;
                  }
 +            }
  }
  
  static void decode_refpass(Jpeg2000T1Context *t1, int width, int height,
  
  static void decode_clnpass(Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1,
                             int width, int height, int bpno, int bandno,
 -                           int seg_symbols)
 +                           int seg_symbols, int vert_causal_ctx_csty_symbol)
  {
      int mask = 3 << (bpno - 1), y0, x, y, runlen, dec;
  
 -    for (y0 = 0; y0 < height; y0 += 4)
 +    for (y0 = 0; y0 < height; y0 += 4) {
          for (x = 0; x < width; x++) {
              if (y0 + 3 < height &&
                  !((t1->flags[y0 + 1][x + 1] & (JPEG2000_T1_SIG_NB | JPEG2000_T1_VIS | JPEG2000_T1_SIG)) ||
  
              for (y = y0 + runlen; y < y0 + 4 && y < height; y++) {
                  if (!dec) {
 -                    if (!(t1->flags[y + 1][x + 1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS)))
 -                        dec = ff_mqc_decode(&t1->mqc,
 -                                            t1->mqc.cx_states +
 -                                            ff_jpeg2000_getsigctxno(t1->flags[y + 1][x + 1],
 -                                                                   bandno));
 +                    if (!(t1->flags[y+1][x+1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS))) {
 +                        int flags_mask = -1;
 +                        if (vert_causal_ctx_csty_symbol && y == y0 + 3)
 +                            flags_mask &= ~(JPEG2000_T1_SIG_S | JPEG2000_T1_SIG_SW | JPEG2000_T1_SIG_SE);
 +                        dec = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ff_jpeg2000_getsigctxno(t1->flags[y+1][x+1] & flags_mask,
 +                                                                                             bandno));
 +                    }
                  }
                  if (dec) {
                      int xorbit;
                  t1->flags[y + 1][x + 1] &= ~JPEG2000_T1_VIS;
              }
          }
 +    }
      if (seg_symbols) {
          int val;
          val = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI);
@@@ -930,41 -941,31 +929,41 @@@ static int decode_cblk(Jpeg2000DecoderC
                         Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk,
                         int width, int height, int bandpos)
  {
 -    int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y;
 +    int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y, clnpass_cnt = 0;
 +    int bpass_csty_symbol = JPEG2000_CBLK_BYPASS & codsty->cblk_style;
 +    int vert_causal_ctx_csty_symbol = JPEG2000_CBLK_VSC & codsty->cblk_style;
  
      for (y = 0; y < height; y++)
 -        memset(t1->data[y], 0, width * sizeof(width));
 +        memset(t1->data[y], 0, width * sizeof(**t1->data));
 +
      /* If code-block contains no compressed data: nothing to do. */
      if (!cblk->length)
          return 0;
 -    for (y = 0; y < height + 2; y++)
 -        memset(t1->flags[y], 0, (width + 2) * sizeof(width));
  
 +    for (y = 0; y < height+2; y++)
 +        memset(t1->flags[y], 0, (width + 2)*sizeof(**t1->flags));
 +
 +    cblk->data[cblk->length] = 0xff;
 +    cblk->data[cblk->length+1] = 0xff;
      ff_mqc_initdec(&t1->mqc, cblk->data);
 -    cblk->data[cblk->length]     = 0xff;
 -    cblk->data[cblk->length + 1] = 0xff;
  
      while (passno--) {
 -        switch (pass_t) {
 +        switch(pass_t) {
          case 0:
 -            decode_sigpass(t1, width, height, bpno + 1, bandpos);
 +            decode_sigpass(t1, width, height, bpno + 1, bandpos,
 +                           bpass_csty_symbol && (clnpass_cnt >= 4), vert_causal_ctx_csty_symbol);
              break;
          case 1:
              decode_refpass(t1, width, height, bpno + 1);
 +            if (bpass_csty_symbol && clnpass_cnt >= 4)
 +                ff_mqc_initdec(&t1->mqc, cblk->data);
              break;
          case 2:
              decode_clnpass(s, t1, width, height, bpno + 1, bandpos,
 -                           codsty->cblk_style & JPEG2000_CBLK_SEGSYM);
 +                           codsty->cblk_style & JPEG2000_CBLK_SEGSYM, vert_causal_ctx_csty_symbol);
 +            clnpass_cnt = clnpass_cnt + 1;
 +            if (bpass_csty_symbol && clnpass_cnt >= 4)
 +                ff_mqc_initdec(&t1->mqc, cblk->data);
              break;
          }
  
@@@ -988,14 -989,13 +987,14 @@@ static void dequantization_float(int x
                                   Jpeg2000Component *comp,
                                   Jpeg2000T1Context *t1, Jpeg2000Band *band)
  {
 -    int i, j, idx;
 -    float *datap = &comp->data[(comp->coord[0][1] - comp->coord[0][0]) * y + x];
 -    for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j)
 -        for (i = 0; i < (cblk->coord[0][1] - cblk->coord[0][0]); ++i) {
 -            idx        = (comp->coord[0][1] - comp->coord[0][0]) * j + i;
 -            datap[idx] = (float)(t1->data[j][i]) * ((float)band->stepsize);
 -        }
 +    int i, j;
 +    int w = cblk->coord[0][1] - cblk->coord[0][0];
 +    for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j) {
 +        float *datap = &comp->f_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x];
 +        int *src = t1->data[j];
 +        for (i = 0; i < w; ++i)
 +            datap[i] = src[i] * band->f_stepsize;
 +    }
  }
  
  /* Integer dequantization of a codeblock.*/
@@@ -1003,14 -1003,15 +1002,14 @@@ static void dequantization_int(int x, i
                                 Jpeg2000Component *comp,
                                 Jpeg2000T1Context *t1, Jpeg2000Band *band)
  {
 -    int i, j, idx;
 -    int32_t *datap =
 -        (int32_t *) &comp->data[(comp->coord[0][1] - comp->coord[0][0]) * y + x];
 -    for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j)
 -        for (i = 0; i < (cblk->coord[0][1] - cblk->coord[0][0]); ++i) {
 -            idx        = (comp->coord[0][1] - comp->coord[0][0]) * j + i;
 -            datap[idx] =
 -                ((int32_t)(t1->data[j][i]) * ((int32_t)band->stepsize) + (1 << 15)) >> 16;
 -        }
 +    int i, j;
 +    int w = cblk->coord[0][1] - cblk->coord[0][0];
 +    for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j) {
 +        int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x];
 +        int *src = t1->data[j];
 +        for (i = 0; i < w; ++i)
 +            datap[i] = (src[i] * band->i_stepsize + (1 << 15)) >> 16;
 +    }
  }
  
  /* Inverse ICT parameters in float and integer.
@@@ -1036,13 -1037,12 +1035,13 @@@ static void mct_decode(Jpeg2000DecoderC
  
      for (i = 0; i < 3; i++)
          if (tile->codsty[0].transform == FF_DWT97)
 -            srcf[i] = tile->comp[i].data;
 +            srcf[i] = tile->comp[i].f_data;
          else
 -            src[i] = (int32_t *)tile->comp[i].data;
 +            src [i] = tile->comp[i].i_data;
  
      for (i = 0; i < 2; i++)
          csize *= tile->comp[0].coord[i][1] - tile->comp[0].coord[i][0];
 +
      switch (tile->codsty[0].transform) {
      case FF_DWT97:
          for (i = 0; i < csize; i++) {
@@@ -1087,26 -1087,21 +1086,26 @@@ static int jpeg2000_decode_tile(Jpeg200
  
      uint8_t *line;
      Jpeg2000T1Context t1;
 -    /* Loop on tile components */
  
 +    /* Loop on tile components */
      for (compno = 0; compno < s->ncomponents; compno++) {
          Jpeg2000Component *comp     = tile->comp + compno;
          Jpeg2000CodingStyle *codsty = tile->codsty + compno;
 +
          /* Loop on resolution levels */
          for (reslevelno = 0; reslevelno < codsty->nreslevels2decode; reslevelno++) {
              Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
              /* Loop on bands */
              for (bandno = 0; bandno < rlevel->nbands; bandno++) {
 -                uint16_t nb_precincts, precno;
 +                int nb_precincts, precno;
                  Jpeg2000Band *band = rlevel->band + bandno;
                  int cblkno = 0, bandpos;
 +
                  bandpos = bandno + (reslevelno > 0);
  
 +                if (band->coord[0][0] == band->coord[0][1] || band->coord[1][0] == band->coord[1][1])
 +                    continue;
 +
                  nb_precincts = rlevel->num_precincts_x * rlevel->num_precincts_y;
                  /* Loop on precincts */
                  for (precno = 0; precno < nb_precincts; precno++) {
                                      cblk->coord[1][1] - cblk->coord[1][0],
                                      bandpos);
  
-                         /* Manage band offsets */
                          x = cblk->coord[0][0];
                          y = cblk->coord[1][0];
  
 -                        if (s->avctx->flags & CODEC_FLAG_BITEXACT)
 -                            dequantization_int(x, y, cblk, comp, &t1, band);
 -                        else
 +                        if (codsty->transform == FF_DWT97)
                              dequantization_float(x, y, cblk, comp, &t1, band);
 +                        else
 +                            dequantization_int(x, y, cblk, comp, &t1, band);
                     } /* end cblk */
                  } /*end prec */
              } /* end band */
          } /* end reslevel */
  
          /* inverse DWT */
 -        ff_dwt_decode(&comp->dwt, comp->data);
 +        ff_dwt_decode(&comp->dwt, codsty->transform == FF_DWT97 ? (void*)comp->f_data : (void*)comp->i_data);
      } /*end comp */
  
      /* inverse MCT transformation */
      if (tile->codsty[0].mct)
          mct_decode(s, tile);
  
 -    if (s->avctx->pix_fmt == AV_PIX_FMT_BGRA) // RGBA -> BGRA
 -        FFSWAP(float *, tile->comp[0].data, tile->comp[2].data);
 -
      if (s->precision <= 8) {
          for (compno = 0; compno < s->ncomponents; compno++) {
              Jpeg2000Component *comp = tile->comp + compno;
 -            int32_t *datap = (int32_t *)comp->data;
 +            Jpeg2000CodingStyle *codsty = tile->codsty + compno;
 +            float *datap = comp->f_data;
 +            int32_t *i_datap = comp->i_data;
 +            int cbps = s->cbps[compno];
 +            int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
 +
              y    = tile->comp[compno].coord[1][0] - s->image_offset_y;
              line = picture->data[0] + y * picture->linesize[0];
              for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) {
                  x   = tile->comp[compno].coord[0][0] - s->image_offset_x;
                  dst = line + x * s->ncomponents + compno;
  
 -                for (; x < tile->comp[compno].coord[0][1] - s->image_offset_x; x += s->cdx[compno]) {
 -                    *datap += 1 << (s->cbps[compno] - 1);
 -                    if (*datap < 0)
 -                        *datap = 0;
 -                    else if (*datap >= (1 << s->cbps[compno]))
 -                        *datap = (1 << s->cbps[compno]) - 1;
 -                    *dst = *datap++;
 -                    dst += s->ncomponents;
 +                if (codsty->transform == FF_DWT97) {
 +                    for (; x < w; x += s->cdx[compno]) {
 +                        int val = lrintf(*datap) + (1 << (cbps - 1));
 +                        /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
 +                        val = av_clip(val, 0, (1 << cbps) - 1);
 +                        *dst = val << (8 - cbps);
 +                        datap++;
 +                        dst += s->ncomponents;
 +                    }
 +                } else {
 +                    for (; x < w; x += s->cdx[compno]) {
 +                        int val = *i_datap + (1 << (cbps - 1));
 +                        /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
 +                        val = av_clip(val, 0, (1 << cbps) - 1);
 +                        *dst = val << (8 - cbps);
 +                        i_datap++;
 +                        dst += s->ncomponents;
 +                    }
                  }
                  line += picture->linesize[0];
              }
      } else {
          for (compno = 0; compno < s->ncomponents; compno++) {
              Jpeg2000Component *comp = tile->comp + compno;
 -            float *datap = comp->data;
 -            int32_t *i_datap = (int32_t *) comp->data;
 +            Jpeg2000CodingStyle *codsty = tile->codsty + compno;
 +            float *datap = comp->f_data;
 +            int32_t *i_datap = comp->i_data;
              uint16_t *linel;
 +            int cbps = s->cbps[compno];
 +            int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
  
              y     = tile->comp[compno].coord[1][0] - s->image_offset_y;
              linel = (uint16_t *)picture->data[0] + y * (picture->linesize[0] >> 1);
              for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) {
                  uint16_t *dst;
 +
                  x   = tile->comp[compno].coord[0][0] - s->image_offset_x;
                  dst = linel + (x * s->ncomponents + compno);
 -                for (; x < s->avctx->width; x += s->cdx[compno]) {
 -                    int16_t val;
 -                    /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
 -                    if (s->avctx->flags & CODEC_FLAG_BITEXACT)
 -                        val = *i_datap + (1 << (s->cbps[compno] - 1));
 -                    else
 -                        val = lrintf(*datap) + (1 << (s->cbps[compno] - 1));
 -                    val = av_clip(val, 0, (1 << s->cbps[compno]) - 1);
 -                    /* align 12 bit values in little-endian mode */
 -                    *dst = val << 4;
 -                    datap++;
 -                    i_datap++;
 -                    dst += s->ncomponents;
 +                if (codsty->transform == FF_DWT97) {
 +                    for (; x < w; x += s-> cdx[compno]) {
 +                        int  val = lrintf(*datap) + (1 << (cbps - 1));
 +                        /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
 +                        val = av_clip(val, 0, (1 << cbps) - 1);
 +                        /* align 12 bit values in little-endian mode */
 +                        *dst = val << (16 - cbps);
 +                        datap++;
 +                        dst += s->ncomponents;
 +                    }
 +                } else {
 +                    for (; x < w; x += s-> cdx[compno]) {
 +                        int val = *i_datap + (1 << (cbps - 1));
 +                        /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
 +                        val = av_clip(val, 0, (1 << cbps) - 1);
 +                        /* align 12 bit values in little-endian mode */
 +                        *dst = val << (16 - cbps);
 +                        i_datap++;
 +                        dst += s->ncomponents;
 +                    }
                  }
                  linel += picture->linesize[0] >> 1;
              }
          }
      }
 +
      return 0;
  }
  
@@@ -1240,7 -1210,6 +1238,7 @@@ static void jpeg2000_dec_cleanup(Jpeg20
          av_freep(&s->tile[tileno].comp);
      }
      av_freep(&s->tile);
 +    s->numXtiles = s->numYtiles = 0;
  }
  
  static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
  
              tile = s->tile + s->curtileno;
              tp = tile->tile_part + tile->tp_idx;
 +            if (tp->tp_end < s->g.buffer) {
 +                av_log(s->avctx, AV_LOG_ERROR, "Invalid tpend\n");
 +                return AVERROR_INVALIDDATA;
 +            }
              bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer);
              bytestream2_skip(&s->g, tp->tp_end - s->g.buffer);
  
          if (marker == JPEG2000_EOC)
              break;
  
 -        len = bytestream2_get_be16u(&s->g);
 +        len = bytestream2_get_be16(&s->g);
          if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2)
              return AVERROR_INVALIDDATA;
  
          switch (marker) {
          case JPEG2000_SIZ:
              ret = get_siz(s);
 +            if (!s->tile)
 +                s->numXtiles = s->numYtiles = 0;
              break;
          case JPEG2000_COC:
              ret = get_coc(s, codsty, properties);
              ret = get_qcd(s, len, qntsty, properties);
              break;
          case JPEG2000_SOT:
 -            ret = get_sot(s, len);
 +            if (!(ret = get_sot(s, len))) {
 +                av_assert1(s->curtileno >= 0);
 +                codsty = s->tile[s->curtileno].codsty;
 +                qntsty = s->tile[s->curtileno].qntsty;
 +                properties = s->tile[s->curtileno].properties;
 +            }
              break;
          case JPEG2000_COM:
              // the comment is ignored
              bytestream2_skip(&s->g, len - 2);
              break;
          }
 -        if (((bytestream2_tell(&s->g) - oldpos != len) && (marker != JPEG2000_SOT)) || ret) {
 +        if (bytestream2_tell(&s->g) - oldpos != len || ret) {
              av_log(s->avctx, AV_LOG_ERROR,
                     "error during processing marker segment %.4x\n", marker);
              return ret ? ret : -1;
  static int jpeg2000_read_bitstream_packets(Jpeg2000DecoderContext *s)
  {
      int ret = 0;
 -    Jpeg2000Tile *tile = s->tile + s->curtileno;
 +    int tileno;
  
 -    if (ret = init_tile(s, s->curtileno))
 -        return ret;
 -    if (ret = jpeg2000_decode_packets(s, tile))
 -        return ret;
 +    for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) {
 +        Jpeg2000Tile *tile = s->tile + tileno;
 +
 +        if (ret = init_tile(s, tileno))
 +            return ret;
 +
 +        s->g = tile->tile_part[0].tpg;
 +        if (ret = jpeg2000_decode_packets(s, tile))
 +            return ret;
 +    }
  
      return 0;
  }
@@@ -1364,9 -1316,9 +1362,9 @@@ static int jp2_find_codestream(Jpeg2000
      uint32_t atom_size, atom;
      int found_codestream = 0, search_range = 10;
  
 -    while(!found_codestream && search_range
 -          &&
 -          bytestream2_get_bytes_left(&s->g) >= 8) {
 +    while (!found_codestream && search_range
 +           &&
 +           bytestream2_get_bytes_left(&s->g) >= 8) {
          atom_size = bytestream2_get_be32u(&s->g);
          atom      = bytestream2_get_be32u(&s->g);
          if (atom == JP2_CODESTREAM) {
@@@ -1394,15 -1346,10 +1392,12 @@@ static int jpeg2000_decode_frame(AVCode
  
      s->avctx     = avctx;
      bytestream2_init(&s->g, avpkt->data, avpkt->size);
 -    s->curtileno = 0; // TODO: only one tile in DCI JP2K. to implement for more tiles
 +    s->curtileno = -1;
  
-     // reduction factor, i.e number of resolution levels to skip
-     s->reduction_factor = s->lowres;
 -    if (bytestream2_get_bytes_left(&s->g) < 2)
 -        return AVERROR_INVALIDDATA;
 +    if (bytestream2_get_bytes_left(&s->g) < 2) {
 +        ret = AVERROR_INVALIDDATA;
 +        goto end;
 +    }
  
      // check if the image is in jp2 format
      if (bytestream2_get_bytes_left(&s->g) >= 12 &&
          if (!jp2_find_codestream(s)) {
              av_log(avctx, AV_LOG_ERROR,
                     "Could not find Jpeg2000 codestream atom.\n");
 -            return AVERROR_INVALIDDATA;
 +            ret = AVERROR_INVALIDDATA;
 +            goto end;
          }
      } else {
          bytestream2_seek(&s->g, 0, SEEK_SET);
  
      if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) {
          av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n");
 -        return AVERROR_INVALIDDATA;
 +        ret = AVERROR_INVALIDDATA;
 +        goto end;
      }
      if (ret = jpeg2000_read_main_headers(s))
          goto end;
  
      /* get picture buffer */
 -    if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n");
 +    if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0)
          goto end;
 -    }
      picture->pict_type = AV_PICTURE_TYPE_I;
      picture->key_frame = 1;
  
      if (ret = jpeg2000_read_bitstream_packets(s))
          goto end;
 +
      for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++)
          if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
              goto end;
  
 +    jpeg2000_dec_cleanup(s);
 +
      *got_frame = 1;
  
      return bytestream2_tell(&s->g);
@@@ -1463,7 -1407,7 +1458,7 @@@ static void jpeg2000_init_static_data(A
  
  static const AVOption options[] = {
      { "lowres",  "Lower the decoding resolution by a power of two",
-         OFFSET(lowres), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, JPEG2000_MAX_RESLEVELS - 1, VD },
+         OFFSET(reduction_factor), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, JPEG2000_MAX_RESLEVELS - 1, VD },
      { NULL },
  };
  
@@@ -1476,7 -1420,7 +1471,7 @@@ static const AVProfile profiles[] = 
      { FF_PROFILE_UNKNOWN },
  };
  
 -static const AVClass class = {
 +static const AVClass jpeg2000_class = {
      .class_name = "jpeg2000",
      .item_name  = av_default_item_name,
      .option     = options,
@@@ -1492,7 -1436,9 +1487,7 @@@ AVCodec ff_jpeg2000_decoder = 
      .priv_data_size   = sizeof(Jpeg2000DecoderContext),
      .init_static_data = jpeg2000_init_static_data,
      .decode           = jpeg2000_decode_frame,
 -    .priv_class       = &class,
 -    .pix_fmts         = (enum AVPixelFormat[]) { AV_PIX_FMT_XYZ12,
 -                                                 AV_PIX_FMT_GRAY8,
 -                                                 -1 },
 +    .priv_class       = &jpeg2000_class,
 +    .max_lowres       = 5,
      .profiles         = NULL_IF_CONFIG_SMALL(profiles)
  };