Upgrade openjpeg to revision 2997.

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/t1.c

 /*
  * The copyright in this software is being made available under the 2-clauses 
  * BSD License, included below. This software may be subject to other third 
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
@@ skipping 247 matching lines @@
 
 static OPJ_FLOAT64 opj_t1_getwmsedec(
                 OPJ_INT32 nmsedec,
                 OPJ_UINT32 compno,
                 OPJ_UINT32 level,
                 OPJ_UINT32 orient,
                 OPJ_INT32 bpno,
                 OPJ_UINT32 qmfbid,
                 OPJ_FLOAT64 stepsize,
                 OPJ_UINT32 numcomps,
-                const OPJ_FLOAT64 * mct_norms);
+                const OPJ_FLOAT64 * mct_norms,
+                OPJ_UINT32 mct_numcomps);
 
 static void opj_t1_encode_cblk( opj_t1_t *t1,
                                 opj_tcd_cblk_enc_t* cblk,
                                 OPJ_UINT32 orient,
                                 OPJ_UINT32 compno,
                                 OPJ_UINT32 level,
                                 OPJ_UINT32 qmfbid,
                                 OPJ_FLOAT64 stepsize,
                                 OPJ_UINT32 cblksty,
                                 OPJ_UINT32 numcomps,
                                 opj_tcd_tile_t * tile,
-                                const OPJ_FLOAT64 * mct_norms);
+                                const OPJ_FLOAT64 * mct_norms,
+                                OPJ_UINT32 mct_numcomps);
 
 /**
 Decode 1 code-block
 @param t1 T1 handle
 @param cblk Code-block coding parameters
 @param orient
 @param roishift Region of interest shifting value
 @param cblksty Code-block style
 */
 static OPJ_BOOL opj_t1_decode_cblk( opj_t1_t *t1,
@@ skipping 839 matching lines @@
 /** mod fixed_quality */
 static OPJ_FLOAT64 opj_t1_getwmsedec(
                 OPJ_INT32 nmsedec,
                 OPJ_UINT32 compno,
                 OPJ_UINT32 level,
                 OPJ_UINT32 orient,
                 OPJ_INT32 bpno,
                 OPJ_UINT32 qmfbid,
                 OPJ_FLOAT64 stepsize,
                 OPJ_UINT32 numcomps,
-                const OPJ_FLOAT64 * mct_norms)
+                const OPJ_FLOAT64 * mct_norms,
+                OPJ_UINT32 mct_numcomps)
 {
         OPJ_FLOAT64 w1 = 1, w2, wmsedec;
-    OPJ_ARG_NOT_USED(numcomps);
+        OPJ_ARG_NOT_USED(numcomps);
 
-        if (mct_norms) {
+        if (mct_norms && (compno < mct_numcomps)) {
                 w1 = mct_norms[compno];
         }
 
         if (qmfbid == 1) {
                 w2 = opj_dwt_getnorm(level, orient);
         } else {        /* if (qmfbid == 0) */
                 w2 = opj_dwt_getnorm_real(level, orient);
         }
 
         wmsedec = w1 * w2 * stepsize * (1 << bpno);
@@ skipping 299 matching lines @@
         }
         return OPJ_TRUE;
 }
 
 
 
 
 OPJ_BOOL opj_t1_encode_cblks(   opj_t1_t *t1,
                                 opj_tcd_tile_t *tile,
                                 opj_tcp_t *tcp,
-                                const OPJ_FLOAT64 * mct_norms
+                                const OPJ_FLOAT64 * mct_norms,
+                                OPJ_UINT32 mct_numcomps
                                 )
 {
         OPJ_UINT32 compno, resno, bandno, precno, cblkno;
 
         tile->distotile = 0;            /* fixed_quality */
 
         for (compno = 0; compno < tile->numcomps; ++compno) {
                 opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
                 opj_tccp_t* tccp = &tcp->tccps[compno];
                 OPJ_UINT32 tile_w = (OPJ_UINT32)(tilec->x1 - tilec->x0);
@@ skipping 47 matching lines @@
                                                                         tiledp[tileIndex] <<= T1_NMSEDEC_FRACBITS;
                                                                         tileIndex++;
                                                                 }
                                                                 tileIndex += tileLineAdvance;
                                                         }
                                                 } else {                /* if (tccp->qmfbid == 0) */
                                                         for (j = 0; j < cblk_h; ++j) {
                                                                 for (i = 0; i < cblk_w; ++i) {
                                                                         OPJ_INT32 tmp = tiledp[tileIndex];
                                                                         tiledp[tileIndex] =
-                                                                                opj_int_fix_mul(
+                                                                                opj_int_fix_mul_t1(
                                                                                 tmp,
-                                                                                bandconst) >> (11 - T1_NMSEDEC_FRACBITS);
+                                                                                bandconst);
                                                                         tileIndex++;
                                                                 }
                                                                 tileIndex += tileLineAdvance;
                                                         }
                                                 }
 
                                                 opj_t1_encode_cblk(
                                                                 t1,
                                                                 cblk,
                                                                 band->bandno,
                                                                 compno,
                                                                 tilec->numresolutions - 1 - resno,
                                                                 tccp->qmfbid,
                                                                 band->stepsize,
                                                                 tccp->cblksty,
                                                                 tile->numcomps,
                                                                 tile,
-                                                                mct_norms);
+                                                                mct_norms,
+                                                                mct_numcomps);
 
                                         } /* cblkno */
                                 } /* precno */
                         } /* bandno */
                 } /* resno  */
         } /* compno  */
         return OPJ_TRUE;
 }
 
 /** mod fixed_quality */
 void opj_t1_encode_cblk(opj_t1_t *t1,
                         opj_tcd_cblk_enc_t* cblk,
                         OPJ_UINT32 orient,
                         OPJ_UINT32 compno,
                         OPJ_UINT32 level,
                         OPJ_UINT32 qmfbid,
                         OPJ_FLOAT64 stepsize,
                         OPJ_UINT32 cblksty,
                         OPJ_UINT32 numcomps,
                         opj_tcd_tile_t * tile,
-                        const OPJ_FLOAT64 * mct_norms)
+                        const OPJ_FLOAT64 * mct_norms,
+                        OPJ_UINT32 mct_numcomps)
 {
         OPJ_FLOAT64 cumwmsedec = 0.0;
 
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
 
         OPJ_UINT32 passno;
         OPJ_INT32 bpno;
         OPJ_UINT32 passtype;
         OPJ_INT32 nmsedec = 0;
         OPJ_INT32 max;
@@ skipping 34 matching lines @@
                                 break;
                         case 2:
                                 opj_t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
                                 /* code switch SEGMARK (i.e. SEGSYM) */
                                 if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
                                         opj_mqc_segmark_enc(mqc);
                                 break;
                 }
 
                 /* fixed_quality */
-                tempwmsedec = opj_t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps,mct_norms) ;
+                tempwmsedec = opj_t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps,mct_norms, mct_numcomps) ;
                 cumwmsedec += tempwmsedec;
                 tile->distotile += tempwmsedec;
 
                 /* Code switch "RESTART" (i.e. TERMALL) */
                 if ((cblksty & J2K_CCP_CBLKSTY_TERMALL) && !((passtype == 2) && (bpno - 1 < 0))) {
                         if (type == T1_TYPE_RAW) {
                                 opj_mqc_flush(mqc);
                                 correction = 1;
                                 /* correction = mqc_bypass_flush_enc(); */
                         } else {                        /* correction = mqc_restart_enc(); */
@@ skipping 119 matching lines @@
                                 opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
                                 v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag);
                                 *datap = v ? -oneplushalf : oneplushalf;
                                 opj_t1_updateflags(flagsp, v, t1->flags_stride);
                         }
                 }
                 *flagsp |= T1_VISIT;
         }
 }                               /* VSC and  BYPASS by Antonin */
 #endif