Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)
* commit '22e18ea39e371030cc78973d1b46aae45a7ea215':
  jpeg2000: Optimize output sample conversion
  jpeg2000: Reset s->numX/Ytiles on tile deallocation
  jpeg2000: Optimize dequantization
  jpeg2000: Do not assume a single tile
  jpeg2000: Speed up jpeg2000_decode_tile()
  jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()

Conflicts:
libavcodec/jpeg2000dec.c

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

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"
@@@ -54,14 -53,14 +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;
@@@ -81,8 -80,7 +81,8 @@@
  
      int             bit_index;
  
 -    int16_t         curtileno;
 +    int             curtileno;
 +
      Jpeg2000Tile    *tile;
  
      /*options parameters*/
@@@ -96,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) {
@@@ -181,7 -178,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;
@@@ -286,10 -282,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 */
@@@ -408,7 -404,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);
@@@ -486,12 -482,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
  
@@@ -705,12 -703,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;
          }
@@@ -726,9 -728,6 +726,9 @@@ static int jpeg2000_decode_packets(Jpeg
  
      s->bit_index = 8;
      switch (tile->codsty[0].prog_order) {
 +    case JPEG2000_PGOD_RLCP:
 +        avpriv_request_sample(s->avctx, "Progression order RLCP");
 +
      case JPEG2000_PGOD_LRCP:
          for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
              ok_reslevel = 1;
                      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,
          }
          break;
  
 -    case JPEG2000_PGOD_RLCP:
 -        avpriv_request_sample(s->avctx, "Progression order RLCP");
 -        ret = AVERROR_PATCHWELCOME;
 -        break;
 -
      case JPEG2000_PGOD_RPCL:
          avpriv_request_sample(s->avctx, "Progression order RPCL");
          ret = AVERROR_PATCHWELCOME;
@@@ -942,9 -946,10 +942,10 @@@ 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, 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;
+     int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y;
+     int clnpass_cnt = 0;
+     int bpass_csty_symbol           = codsty->cblk_style & JPEG2000_CBLK_BYPASS;
+     int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC;
  
      for (y = 0; y < height; y++)
          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(**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,
-                            bpass_csty_symbol && (clnpass_cnt >= 4), vert_causal_ctx_csty_symbol);
+                            bpass_csty_symbol && (clnpass_cnt >= 4),
+                            vert_causal_ctx_csty_symbol);
              break;
          case 1:
              decode_refpass(t1, width, height, bpno + 1);
              break;
          case 2:
              decode_clnpass(s, t1, width, height, bpno + 1, bandpos,
-                            codsty->cblk_style & JPEG2000_CBLK_SEGSYM, vert_causal_ctx_csty_symbol);
+                            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);
@@@ -1054,7 -1060,6 +1057,7 @@@ static void mct_decode(Jpeg2000DecoderC
  
      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++) {
@@@ -1099,24 -1104,23 +1102,25 @@@ 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])
+                 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;
      if (s->precision <= 8) {
          for (compno = 0; compno < s->ncomponents; compno++) {
              Jpeg2000Component *comp = tile->comp + compno;
 +            Jpeg2000CodingStyle *codsty = tile->codsty + compno;
              float *datap = comp->f_data;
              int32_t *i_datap = comp->i_data;
              int cbps = s->cbps[compno];
                  x   = tile->comp[compno].coord[0][0] - s->image_offset_x;
                  dst = line + x * s->ncomponents + compno;
  
 -                if (tile->codsty->transform == FF_DWT97) {
 +                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 */
      } else {
          for (compno = 0; compno < s->ncomponents; compno++) {
              Jpeg2000Component *comp = tile->comp + compno;
 +            Jpeg2000CodingStyle *codsty = tile->codsty + compno;
              float *datap = comp->f_data;
              int32_t *i_datap = comp->i_data;
              uint16_t *linel;
              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);
 -                if (tile->codsty->transform == FF_DWT97) {
 +                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 */
@@@ -1284,10 -1285,6 +1288,10 @@@ static int jpeg2000_read_main_headers(J
  
              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);
              break;
          case JPEG2000_SOT:
              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;
@@@ -1375,9 -1369,9 +1379,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) {
@@@ -1405,7 -1399,7 +1409,7 @@@ 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;
  
      if (bytestream2_get_bytes_left(&s->g) < 2) {
          ret = AVERROR_INVALIDDATA;
          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;
@@@ -1482,7 -1477,7 +1486,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,
@@@ -1498,7 -1493,6 +1502,7 @@@ AVCodec ff_jpeg2000_decoder = 
      .priv_data_size   = sizeof(Jpeg2000DecoderContext),
      .init_static_data = jpeg2000_init_static_data,
      .decode           = jpeg2000_decode_frame,
 -    .priv_class       = &class,
 +    .priv_class       = &jpeg2000_class,
 +    .max_lowres       = 5,
      .profiles         = NULL_IF_CONFIG_SMALL(profiles)
  };