Update to openjpeg r2944

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 478 matching lines @@
 
         *nmsedec = 0;
         one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_enc_sigpass_step(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
-                                                &t1->data[(j * t1->w) + i],
+                                                &t1->data[(j * t1->data_stride) + i],
                                                 orient,
                                                 bpno,
                                                 one,
                                                 nmsedec,
                                                 type,
                                                 vsc);
                         }
                 }
         }
 }
@@ skipping 201 matching lines @@
 
         *nmsedec = 0;
         one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_enc_refpass_step(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
-                                                &t1->data[(j * t1->w) + i],
+                                                &t1->data[(j * t1->data_stride) + i],
                                                 bpno,
                                                 one,
                                                 nmsedec,
                                                 type,
                                                 vsc);
                         }
                 }
         }
 }
 
@@ skipping 231 matching lines @@
                                         agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
                                                 || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
                                                 || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
                                                 || MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
                                 }
                         } else {
                                 agg = 0;
                         }
                         if (agg) {
                                 for (runlen = 0; runlen < 4; ++runlen) {
-                                        if (opj_int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
+                                        if (opj_int_abs(t1->data[((k + runlen)*t1->data_stride) + i]) & one)
                                                 break;
                                 }
                                 opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
                                 opj_mqc_encode(mqc, runlen != 4);
                                 if (runlen == 4) {
                                         continue;
                                 }
                                 opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
                                 opj_mqc_encode(mqc, runlen >> 1);
                                 opj_mqc_encode(mqc, runlen & 1);
                         } else {
                                 runlen = 0;
                         }
                         for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_enc_clnpass_step(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
-                                                &t1->data[(j * t1->w) + i],
+                                                &t1->data[(j * t1->data_stride) + i],
                                                 orient,
                                                 bpno,
                                                 one,
                                                 nmsedec,
                                                 agg && (j == k + runlen),
                                                 vsc);
                         }
                 }
         }
 }
@@ skipping 156 matching lines @@
 }
 
 OPJ_BOOL opj_t1_allocate_buffers(
                 opj_t1_t *t1,
                 OPJ_UINT32 w,
                 OPJ_UINT32 h)
 {
         OPJ_UINT32 datasize=w * h;
         OPJ_UINT32 flagssize;
 
-        if(datasize > t1->datasize){
-                opj_aligned_free(t1->data);
-                t1->data = (OPJ_INT32*) opj_aligned_malloc(datasize * sizeof(OPJ_INT32));
-                if(!t1->data){
-                        /* FIXME event manager error callback */
-                        return OPJ_FALSE;
+        /* encoder uses tile buffer, so no need to allocate */
+        if (!t1->encoder) {
+                if(datasize > t1->datasize){
+                        opj_aligned_free(t1->data);
+                        t1->data = (OPJ_INT32*) opj_aligned_malloc(datasize * sizeof(OPJ_INT32));
+                        if(!t1->data){
+                                /* FIXME event manager error callback */
+                                return OPJ_FALSE;
+                        }
+                        t1->datasize=datasize;
                 }
-                t1->datasize=datasize;
+                memset(t1->data,0,datasize * sizeof(OPJ_INT32));
         }
-        memset(t1->data,0,datasize * sizeof(OPJ_INT32));
-
         t1->flags_stride=w+2;
         flagssize=t1->flags_stride * (h+2);
 
         if(flagssize > t1->flagssize){
                 opj_aligned_free(t1->flags);
                 t1->flags = (opj_flag_t*) opj_aligned_malloc(flagssize * sizeof(opj_flag_t));
                 if(!t1->flags){
                         /* FIXME event manager error callback */
                         return OPJ_FALSE;
                 }
                 t1->flagssize=flagssize;
         }
         memset(t1->flags,0,flagssize * sizeof(opj_flag_t));
 
         t1->w=w;
         t1->h=h;
 
         return OPJ_TRUE;
 }
 
 /* ----------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------- */
 /**
  * Creates a new Tier 1 handle
  * and initializes the look-up tables of the Tier-1 coder/decoder
  * @return a new T1 handle if successful, returns NULL otherwise
 */
-opj_t1_t* opj_t1_create()
+opj_t1_t* opj_t1_create(OPJ_BOOL isEncoder)
 {
         opj_t1_t *l_t1 = 00;
 
         l_t1 = (opj_t1_t*) opj_calloc(1,sizeof(opj_t1_t));
         if (!l_t1) {
                 return 00;
         }
 
         /* create MQC and RAW handles */
         l_t1->mqc = opj_mqc_create();
         if (! l_t1->mqc) {
                 opj_t1_destroy(l_t1);
                 return 00;
         }
 
         l_t1->raw = opj_raw_create();
         if (! l_t1->raw) {
                 opj_t1_destroy(l_t1);
                 return 00;
         }
+        l_t1->encoder = isEncoder;
 
         return l_t1;
 }
 
 
 /**
  * Destroys a previously created T1 handle
  *
  * @param p_t1 Tier 1 handle to destroy
 */
 void opj_t1_destroy(opj_t1_t *p_t1)
 {
         if (! p_t1) {
                 return;
         }
 
         /* destroy MQC and RAW handles */
         opj_mqc_destroy(p_t1->mqc);
         p_t1->mqc = 00;
         opj_raw_destroy(p_t1->raw);
         p_t1->raw = 00;
         
-    if (p_t1->data) {
+        /* encoder uses tile buffer, so no need to free */
+        if (!p_t1->encoder && p_t1->data) {
                 opj_aligned_free(p_t1->data);
                 p_t1->data = 00;
         }
 
         if (p_t1->flags) {
                 opj_aligned_free(p_t1->flags);
                 p_t1->flags = 00;
         }
 
         opj_free(p_t1);
@@ skipping 213 matching lines @@
 
                         for (bandno = 0; bandno < res->numbands; ++bandno) {
                                 opj_tcd_band_t* restrict band = &res->bands[bandno];
                 OPJ_INT32 bandconst = 8192 * 8192 / ((OPJ_INT32) floor(band->stepsize * 8192));
 
                                 for (precno = 0; precno < res->pw * res->ph; ++precno) {
                                         opj_tcd_precinct_t *prc = &band->precincts[precno];
 
                                         for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
                                                 opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-                                                OPJ_INT32 * restrict datap;
                                                 OPJ_INT32* restrict tiledp;
                                                 OPJ_UINT32 cblk_w;
                                                 OPJ_UINT32 cblk_h;
-                                                OPJ_UINT32 i, j;
+                                                OPJ_UINT32 i, j, tileIndex=0, tileLineAdvance;
 
                                                 OPJ_INT32 x = cblk->x0 - band->x0;
                                                 OPJ_INT32 y = cblk->y0 - band->y0;
                                                 if (band->bandno & 1) {
                                                         opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
                                                         x += pres->x1 - pres->x0;
                                                 }
                                                 if (band->bandno & 2) {
                                                         opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
                                                         y += pres->y1 - pres->y0;
                                                 }
 
                                                 if(!opj_t1_allocate_buffers(
                                                                         t1,
                                                                         (OPJ_UINT32)(cblk->x1 - cblk->x0),
                                                                         (OPJ_UINT32)(cblk->y1 - cblk->y0)))
                                                 {
                                                         return OPJ_FALSE;
                                                 }
 
-                                                datap=t1->data;
                                                 cblk_w = t1->w;
                                                 cblk_h = t1->h;
+                                                tileLineAdvance = tile_w - cblk_w;
 
                                                 tiledp=&tilec->data[(OPJ_UINT32)y * tile_w + (OPJ_UINT32)x];
+                                                t1->data = tiledp;
+                                                t1->data_stride = tile_w;
                                                 if (tccp->qmfbid == 1) {
                                                         for (j = 0; j < cblk_h; ++j) {
                                                                 for (i = 0; i < cblk_w; ++i) {
-                                                                        OPJ_INT32 tmp = tiledp[(j * tile_w) + i];
-                                                                        datap[(j * cblk_w) + i] = tmp << T1_NMSEDEC_FRACBITS;
+                                                                        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[(j * tile_w) + i];
-                                                                        datap[(j * cblk_w) + i] =
+                                                                        OPJ_INT32 tmp = tiledp[tileIndex];
+                                                                        tiledp[tileIndex] =
                                                                                 opj_int_fix_mul(
                                                                                 tmp,
                                                                                 bandconst) >> (11 - T1_NMSEDEC_FRACBITS);
+                                                                        tileIndex++;
                                                                 }
+                                                                tileIndex += tileLineAdvance;
                                                         }
                                                 }
 
                                                 opj_t1_encode_cblk(
                                                                 t1,
                                                                 cblk,
                                                                 band->bandno,
                                                                 compno,
                                                                 tilec->numresolutions - 1 - resno,
                                                                 tccp->qmfbid,
@@ skipping 26 matching lines @@
 {
         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;
-        OPJ_UINT32 i;
+        OPJ_UINT32 i, j;
         OPJ_BYTE type = T1_TYPE_MQ;
         OPJ_FLOAT64 tempwmsedec;
 
         max = 0;
-        for (i = 0; i < t1->w * t1->h; ++i) {
-                OPJ_INT32 tmp = abs(t1->data[i]);
-                max = opj_int_max(max, tmp);
+        for (i = 0; i < t1->w; ++i) {
+                for (j = 0; j < t1->h; ++j) {
+                        OPJ_INT32 tmp = abs(t1->data[i + j*t1->data_stride]);
+                        max = opj_int_max(max, tmp);
+                }
         }
 
         cblk->numbps = max ? (OPJ_UINT32)((opj_int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS) : 0;
 
         bpno = (OPJ_INT32)(cblk->numbps - 1);
         passtype = 2;
 
         opj_mqc_resetstates(mqc);
         opj_mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
         opj_mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
@@ skipping 154 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