* Copyright (c) 2003-2014, Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * Copyright (c) 2012, Carl Hetherington
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/** @defgroup T1 T1 - Implementation of the tier-1 coding */
/*@{*/
+#define ENC_FLAGS(x, y) (t1->enc_flags[x + 1 + ((y / 4) + 1) * t1->flags_stride])
+
/** @name Local static functions */
/*@{*/
+static INLINE OPJ_BYTE opj_t1_enc_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient);
static INLINE OPJ_BYTE opj_t1_getctxno_zc(opj_mqc_t *mqc, OPJ_UINT32 f);
+static OPJ_BYTE opj_t1_enc_getctxno_sc(OPJ_UINT32 fX, OPJ_UINT32 pfX,
+ OPJ_UINT32 nfX, OPJ_UINT32 ci);
static OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f);
+static INLINE OPJ_UINT32 opj_t1_enc_getctxno_mag(OPJ_UINT32 f);
static INLINE OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f);
+static OPJ_BYTE opj_t1_enc_getspb(OPJ_UINT32 fX, OPJ_UINT32 pfX, OPJ_UINT32 nfX,
+ OPJ_UINT32 ci);
static OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f);
static OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos);
static OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos);
+static void opj_t1_enc_updateflags(opj_flag_enc_t *flagsp, OPJ_UINT32 ci,
+ OPJ_UINT32 s, OPJ_UINT32 stride);
static INLINE void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s,
OPJ_UINT32 stride);
/**
Encode significant pass
*/
static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
+ opj_flag_enc_t *flagsp,
OPJ_INT32 *datap,
+ OPJ_UINT32 orient,
OPJ_INT32 bpno,
OPJ_INT32 one,
OPJ_INT32 *nmsedec,
OPJ_BYTE type,
- OPJ_UINT32 vsc);
+ OPJ_UINT32 k);
/**
Decode significant pass
*/
-#if 0
-static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
- OPJ_INT32 *datap,
- OPJ_UINT32 orient,
- OPJ_INT32 oneplushalf,
- OPJ_BYTE type,
- OPJ_UINT32 vsc);
-#endif
static INLINE void opj_t1_dec_sigpass_step_raw(
opj_t1_t *t1,
*/
static void opj_t1_enc_sigpass(opj_t1_t *t1,
OPJ_INT32 bpno,
+ OPJ_UINT32 orient,
OPJ_INT32 *nmsedec,
OPJ_BYTE type,
OPJ_UINT32 cblksty);
Encode refinement pass
*/
static void opj_t1_enc_refpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
+ opj_flag_enc_t *flagsp,
OPJ_INT32 *datap,
OPJ_INT32 bpno,
OPJ_INT32 one,
OPJ_INT32 *nmsedec,
- OPJ_BYTE type,
- OPJ_UINT32 vsc);
+ OPJ_BYTE type);
/**
/**
Decode refinement pass
*/
-#if 0
-static void opj_t1_dec_refpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
- OPJ_INT32 *datap,
- OPJ_INT32 poshalf,
- OPJ_INT32 neghalf,
- OPJ_BYTE type,
- OPJ_UINT32 vsc);
-#endif
static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1,
*/
static void opj_t1_enc_clnpass_step(
opj_t1_t *t1,
- opj_flag_t *flagsp,
+ opj_flag_enc_t *flagsp,
OPJ_INT32 *datap,
+ OPJ_UINT32 orient,
OPJ_INT32 bpno,
OPJ_INT32 one,
OPJ_INT32 *nmsedec,
- OPJ_UINT32 partial,
- OPJ_UINT32 vsc);
+ OPJ_UINT32 agg,
+ OPJ_UINT32 runlen,
+ OPJ_UINT32 x,
+ OPJ_UINT32 y);
/**
Decode clean-up pass
*/
static void opj_t1_enc_clnpass(
opj_t1_t *t1,
OPJ_INT32 bpno,
+ OPJ_UINT32 orient,
OPJ_INT32 *nmsedec,
OPJ_UINT32 cblksty);
/* ----------------------------------------------------------------------- */
+static INLINE OPJ_BYTE opj_t1_enc_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient)
+{
+ return lut_enc_ctxno_zc[(orient << 9) | (f & T1_SIGMA_NEIGHBOURS)];
+}
+
static OPJ_BYTE opj_t1_getctxno_zc(opj_mqc_t *mqc, OPJ_UINT32 f)
{
return mqc->lut_ctxno_zc_orient[(f & T1_SIG_OTH)];
}
+
+static OPJ_BYTE opj_t1_enc_getctxno_sc(OPJ_UINT32 fX, OPJ_UINT32 pfX,
+ OPJ_UINT32 nfX, OPJ_UINT32 ci)
+{
+ /*
+ 0 pfX T1_CHI_THIS T1_LUT_CTXNO_SGN_W
+ 1 tfX T1_SIGMA_1 T1_LUT_CTXNO_SIG_N
+ 2 nfX T1_CHI_THIS T1_LUT_CTXNO_SGN_E
+ 3 tfX T1_SIGMA_3 T1_LUT_CTXNO_SIG_W
+ 4 fX T1_CHI_(THIS - 1) T1_LUT_CTXNO_SGN_N
+ 5 tfX T1_SIGMA_5 T1_LUT_CTXNO_SIG_E
+ 6 fX T1_CHI_(THIS + 1) T1_LUT_CTXNO_SGN_S
+ 7 tfX T1_SIGMA_7 T1_LUT_CTXNO_SIG_S
+ */
+
+ OPJ_UINT32 lu = (fX >> (ci * 3)) & (T1_SIGMA_1 | T1_SIGMA_3 | T1_SIGMA_5 |
+ T1_SIGMA_7);
+
+ lu |= (pfX >> (T1_CHI_THIS_I + (ci * 3U))) & (1U << 0);
+ lu |= (nfX >> (T1_CHI_THIS_I - 2U + (ci * 3U))) & (1U << 2);
+ if (ci == 0U) {
+ lu |= (fX >> (T1_CHI_0_I - 4U)) & (1U << 4);
+ } else {
+ lu |= (fX >> (T1_CHI_1_I - 4U + ((ci - 1U) * 3U))) & (1U << 4);
+ }
+ lu |= (fX >> (T1_CHI_2_I - 6U + (ci * 3U))) & (1U << 6);
+
+ return lut_enc_ctxno_sc[lu];
+}
+
static OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f)
{
return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
}
+static INLINE OPJ_UINT32 opj_t1_enc_getctxno_mag(OPJ_UINT32 f)
+{
+ OPJ_UINT32 tmp = (f & T1_SIGMA_NEIGHBOURS) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
+ OPJ_UINT32 tmp2 = (f & T1_MU_0) ? T1_CTXNO_MAG + 2 : tmp;
+ return tmp2;
+}
+
static OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f)
{
OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
return (tmp2);
}
+static OPJ_BYTE opj_t1_enc_getspb(OPJ_UINT32 fX, OPJ_UINT32 pfX, OPJ_UINT32 nfX,
+ OPJ_UINT32 ci)
+{
+ /*
+ 0 pfX T1_CHI_THIS T1_LUT_SGN_W
+ 1 tfX T1_SIGMA_1 T1_LUT_SIG_N
+ 2 nfX T1_CHI_THIS T1_LUT_SGN_E
+ 3 tfX T1_SIGMA_3 T1_LUT_SIG_W
+ 4 fX T1_CHI_(THIS - 1) T1_LUT_SGN_N
+ 5 tfX T1_SIGMA_5 T1_LUT_SIG_E
+ 6 fX T1_CHI_(THIS + 1) T1_LUT_SGN_S
+ 7 tfX T1_SIGMA_7 T1_LUT_SIG_S
+ */
+
+ int lu = (fX >> (ci * 3U)) & (T1_SIGMA_1 | T1_SIGMA_3 | T1_SIGMA_5 |
+ T1_SIGMA_7);
+
+ lu |= (pfX >> (T1_CHI_THIS_I + (ci * 3U))) & (1U << 0);
+ lu |= (nfX >> (T1_CHI_THIS_I - 2U + (ci * 3U))) & (1U << 2);
+ if (ci == 0U) {
+ lu |= (fX >> (T1_CHI_0_I - 4U)) & (1U << 4);
+ } else {
+ lu |= (fX >> (T1_CHI_1_I - 4U + ((ci - 1U) * 3U))) & (1U << 4);
+ }
+ lu |= (fX >> (T1_CHI_2_I - 6U + (ci * 3U))) & (1U << 6);
+
+ return lut_enc_spb[lu];
+}
+
static OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f)
{
return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
}
+
+static void opj_t1_enc_updateflags(opj_flag_enc_t *flagsp, OPJ_UINT32 ci,
+ OPJ_UINT32 s, OPJ_UINT32 stride)
+{
+ /* set up to point to the north and south data points' flags words, if required */
+ opj_flag_enc_t* north;
+ opj_flag_enc_t* south;
+
+ /* mark target as significant */
+ *flagsp |= T1_SIGMA_4 << (3U * ci);
+
+ /* north-west, north, north-east */
+ if (ci == 0U) {
+ north = flagsp - stride;
+ *north |= T1_SIGMA_16;
+ north[-1] |= T1_SIGMA_17;
+ north[1] |= T1_SIGMA_15;
+ }
+
+ /* south-west, south, south-east */
+ if (ci == 3U) {
+ south = flagsp + stride;
+ *south |= T1_SIGMA_1;
+ south[-1] |= T1_SIGMA_2;
+ south[1] |= T1_SIGMA_0;
+ }
+
+ /* east */
+ flagsp[-1] |= T1_SIGMA_5 << (3U * ci);
+
+ /* west */
+ flagsp[1] |= T1_SIGMA_3 << (3U * ci);
+
+ if (s) {
+ switch (ci) {
+ case 0U: {
+ *flagsp |= T1_CHI_1;
+ *north |= T1_CHI_5;
+ break;
+ }
+ case 1:
+ *flagsp |= T1_CHI_2;
+ break;
+ case 2:
+ *flagsp |= T1_CHI_3;
+ break;
+ case 3: {
+ *flagsp |= T1_CHI_4;
+ *south |= T1_CHI_0;
+ break;
+ }
+
+ }
+ }
+}
+
static INLINE void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s,
OPJ_UINT32 stride)
{
}
}
-static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
- OPJ_INT32 *datap,
- OPJ_INT32 bpno,
- OPJ_INT32 one,
- OPJ_INT32 *nmsedec,
- OPJ_BYTE type,
- OPJ_UINT32 vsc
- )
+
+void opj_t1_enc_sigpass_step(opj_t1_t *t1,
+ opj_flag_enc_t *flagsp,
+ OPJ_INT32 *datap,
+ OPJ_UINT32 orient,
+ OPJ_INT32 bpno,
+ OPJ_INT32 one,
+ OPJ_INT32 *nmsedec,
+ OPJ_BYTE type,
+ OPJ_UINT32 k
+ )
{
OPJ_INT32 v;
- OPJ_UINT32 flag;
+ OPJ_UINT32 ci;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
- flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
- T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
- if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
- v = (opj_int_abs(*datap) & one) ? 1 : 0;
- opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(mqc, flag)); /* ESSAI */
- if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
- opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
- } else {
- opj_mqc_encode(mqc, (OPJ_UINT32)v);
- }
- if (v) {
- v = *datap < 0 ? 1 : 0;
- *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap),
- (OPJ_UINT32)(bpno));
- opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); /* ESSAI */
+ if (*flagsp == 0U) {
+ /* Nothing to do for any of the 4 data points */
+ return;
+ }
+
+ for (ci = 0U; ci < 4U; ++ci) {
+ /* XXX:TODO enc_flags_t and vsc mode a la
+ vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+ flag = vsc ? ((*dec_flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*dec_flagsp);
+ */
+
+ OPJ_UINT32 const shift_flags = *flagsp >> (ci * 3U);
+
+ if ((shift_flags & (T1_SIGMA_THIS | T1_PI_THIS)) == 0U &&
+ (shift_flags & T1_SIGMA_NEIGHBOURS) != 0U) {
+ v = opj_int_abs(*datap) & one ? 1 : 0;
+ opj_mqc_setcurctx(mqc, opj_t1_enc_getctxno_zc(shift_flags,
+ orient)); /* ESSAI */
if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
- opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
+ opj_mqc_bypass_enc(mqc, v);
} else {
- opj_mqc_encode(mqc, (OPJ_UINT32)(v ^ opj_t1_getspb((OPJ_UINT32)flag)));
+ opj_mqc_encode(mqc, v);
}
- opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride);
+ if (v) {
+ v = *datap < 0 ? 1 : 0;
+ *nmsedec += opj_t1_getnmsedec_sig(opj_int_abs(*datap), bpno);
+ opj_mqc_setcurctx(mqc, opj_t1_enc_getctxno_sc(*flagsp, flagsp[-1], flagsp[1],
+ ci)); /* ESSAI */
+ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
+ opj_mqc_bypass_enc(mqc, v);
+ } else {
+ opj_mqc_encode(mqc, v ^ opj_t1_enc_getspb(*flagsp, flagsp[-1], flagsp[1], ci));
+ }
+ opj_t1_enc_updateflags(flagsp, ci, v, t1->flags_stride);
+ }
+ *flagsp |= T1_PI_0 << (ci * 3U);
}
- *flagsp |= T1_VISIT;
+ datap += t1->data_stride;
}
}
-
static INLINE void opj_t1_dec_sigpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
} /* VSC and BYPASS by Antonin */
-
static void opj_t1_enc_sigpass(opj_t1_t *t1,
OPJ_INT32 bpno,
+ OPJ_UINT32 orient,
OPJ_INT32 *nmsedec,
OPJ_BYTE type,
OPJ_UINT32 cblksty
)
{
- OPJ_UINT32 i, j, k, vsc;
- OPJ_INT32 one;
+ OPJ_UINT32 i, k;
+ OPJ_INT32 const one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+ opj_flag_enc_t* f = &ENC_FLAGS(0, 0);
+ OPJ_UINT32 const extra = t1->flags_stride - t1->w;
+ OPJ_INT32* d = t1->data;
*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->data_stride) + i],
- bpno,
- one,
- nmsedec,
- type,
- vsc);
- }
+ opj_t1_enc_sigpass_step(
+ t1,
+ f,
+ &t1->data[(k * t1->data_stride) + i],
+ orient,
+ bpno,
+ one,
+ nmsedec,
+ type, k);
+
+ ++f;
+ ++d;
}
+ f += extra;
}
}
}
} /* VSC and BYPASS by Antonin */
-
-
static void opj_t1_enc_refpass_step(opj_t1_t *t1,
- opj_flag_t *flagsp,
+ opj_flag_enc_t *flagsp,
OPJ_INT32 *datap,
OPJ_INT32 bpno,
OPJ_INT32 one,
OPJ_INT32 *nmsedec,
- OPJ_BYTE type,
- OPJ_UINT32 vsc)
+ OPJ_BYTE type)
{
OPJ_INT32 v;
- OPJ_UINT32 flag;
+ OPJ_UINT32 ci;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
- flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
- T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
- if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
- *nmsedec += opj_t1_getnmsedec_ref((OPJ_UINT32)opj_int_abs(*datap),
- (OPJ_UINT32)(bpno));
- v = (opj_int_abs(*datap) & one) ? 1 : 0;
- opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */
- if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
- opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
- } else {
- opj_mqc_encode(mqc, (OPJ_UINT32)v);
+ if ((*flagsp & (T1_SIGMA_4 | T1_SIGMA_7 | T1_SIGMA_10 | T1_SIGMA_13)) == 0) {
+ /* none significant */
+ return;
+ }
+ if ((*flagsp & (T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3)) ==
+ (T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3)) {
+ /* all processed by sigpass */
+ return;
+ }
+
+ for (ci = 0U; ci < 4U; ++ci) {
+
+ /* XXX:TODO vsc mode as per
+ vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+ flag = vsc ? ((*dec_flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*dec_flagsp);
+ */
+
+ OPJ_UINT32 shift_flags = *flagsp >> (ci * 3U);
+ if ((shift_flags & (T1_SIGMA_4 | T1_PI_0)) == T1_SIGMA_4) {
+ *nmsedec += opj_t1_getnmsedec_ref(opj_int_abs(*datap), bpno);
+ v = opj_int_abs(*datap) & one ? 1 : 0;
+ opj_mqc_setcurctx(mqc, opj_t1_enc_getctxno_mag(shift_flags)); /* ESSAI */
+ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
+ opj_mqc_bypass_enc(mqc, v);
+ } else {
+ opj_mqc_encode(mqc, v);
+ }
+ *flagsp |= T1_MU_0 << (ci * 3U);
}
- *flagsp |= T1_REFINE;
+ datap += t1->data_stride;
}
}
+
static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1,
opj_colflag_t *colflagsp,
}
} /* VSC and BYPASS by Antonin */
-
static void opj_t1_enc_refpass(
opj_t1_t *t1,
OPJ_INT32 bpno,
OPJ_BYTE type,
OPJ_UINT32 cblksty)
{
- OPJ_UINT32 i, j, k, vsc;
- OPJ_INT32 one;
+ OPJ_UINT32 i, k;
+ const OPJ_INT32 one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+ opj_flag_enc_t* f = &ENC_FLAGS(0, 0);
+ const OPJ_UINT32 extra = t1->flags_stride - t1->w;
*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->data_stride) + i],
- bpno,
- one,
- nmsedec,
- type,
- vsc);
- }
+ for (k = 0U; k < t1->h; k += 4U) {
+ for (i = 0U; i < t1->w; ++i) {
+ opj_t1_enc_refpass_step(
+ t1,
+ f,
+ &t1->data[(k * t1->data_stride) + i],
+ bpno,
+ one,
+ nmsedec,
+ type);
+ ++f;
}
+ f += extra;
}
}
+
static void opj_t1_dec_refpass_raw(
opj_t1_t *t1,
OPJ_INT32 bpno)
}
} /* VSC and BYPASS by Antonin */
-
static void opj_t1_enc_clnpass_step(
opj_t1_t *t1,
- opj_flag_t *flagsp,
+ opj_flag_enc_t *flagsp,
OPJ_INT32 *datap,
+ OPJ_UINT32 orient,
OPJ_INT32 bpno,
OPJ_INT32 one,
OPJ_INT32 *nmsedec,
- OPJ_UINT32 partial,
- OPJ_UINT32 vsc)
+ OPJ_UINT32 agg,
+ OPJ_UINT32 runlen,
+ OPJ_UINT32 x,
+ OPJ_UINT32 y)
{
OPJ_INT32 v;
- OPJ_UINT32 flag;
-
+ OPJ_UINT32 ci;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
- flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
- T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
- if (partial) {
- goto LABEL_PARTIAL;
+ OPJ_UINT32 lim;
+ const OPJ_UINT32 check = (T1_SIGMA_4 | T1_SIGMA_7 | T1_SIGMA_10 | T1_SIGMA_13 |
+ T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
+
+ if ((*flagsp & check) == check) {
+ if (runlen == 0) {
+ *flagsp &= ~(T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
+ } else if (runlen == 1) {
+ *flagsp &= ~(T1_PI_1 | T1_PI_2 | T1_PI_3);
+ } else if (runlen == 2) {
+ *flagsp &= ~(T1_PI_2 | T1_PI_3);
+ } else if (runlen == 3) {
+ *flagsp &= ~(T1_PI_3);
+ }
+ return;
}
- if (!(*flagsp & (T1_SIG | T1_VISIT))) {
- opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(mqc, flag));
- v = (opj_int_abs(*datap) & one) ? 1 : 0;
- opj_mqc_encode(mqc, (OPJ_UINT32)v);
- if (v) {
+
+ lim = 4U < (t1->h - y) ? 4U : (t1->h - y);
+ for (ci = runlen; ci < lim; ++ci) {
+ opj_flag_enc_t shift_flags;
+
+ /* XXX:TODO vsc mode a la
+ vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+ flag = vsc ? ((*dec_flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*dec_flagsp);
+ */
+
+ if ((agg != 0) && (ci == runlen)) {
+ goto LABEL_PARTIAL;
+ }
+
+ shift_flags = *flagsp >> (ci * 3U);
+
+ if (!(shift_flags & (T1_SIGMA_4 | T1_PI_0))) {
+ opj_mqc_setcurctx(mqc, opj_t1_enc_getctxno_zc(shift_flags, orient));
+ v = opj_int_abs(*datap) & one ? 1 : 0;
+ opj_mqc_encode(mqc, v);
+ if (v) {
LABEL_PARTIAL:
- *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap),
- (OPJ_UINT32)(bpno));
- opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
- v = *datap < 0 ? 1 : 0;
- opj_mqc_encode(mqc, (OPJ_UINT32)(v ^ opj_t1_getspb((OPJ_UINT32)flag)));
- opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride);
+ *nmsedec += opj_t1_getnmsedec_sig(opj_int_abs(*datap), bpno);
+ opj_mqc_setcurctx(mqc, opj_t1_enc_getctxno_sc(*flagsp, flagsp[-1], flagsp[1],
+ ci));
+ v = *datap < 0 ? 1 : 0;
+ opj_mqc_encode(mqc, v ^ opj_t1_enc_getspb(*flagsp, flagsp[-1], flagsp[1], ci));
+ opj_t1_enc_updateflags(flagsp, ci, v, t1->flags_stride);
+ }
}
+ *flagsp &= ~(T1_PI_0 << (3U * ci));
+ datap += t1->data_stride;
}
- *flagsp &= (opj_flag_t)~T1_VISIT;
}
+
static void opj_t1_dec_clnpass_step_partial(
opj_t1_t *t1,
opj_flag_t *flagsp,
#endif
}
+#define MACRO_t1_enc_flags(x,y) t1->enc_flags[((x)*(t1->flags_stride))+(y)]
+
static void opj_t1_enc_clnpass(
opj_t1_t *t1,
OPJ_INT32 bpno,
+ OPJ_UINT32 orient,
OPJ_INT32 *nmsedec,
OPJ_UINT32 cblksty)
{
- OPJ_UINT32 i, j, k;
- OPJ_INT32 one;
- OPJ_UINT32 agg, runlen, vsc;
+ OPJ_UINT32 i, k;
+ const OPJ_INT32 one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+ OPJ_UINT32 agg, runlen;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
*nmsedec = 0;
- one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+
for (k = 0; k < t1->h; k += 4) {
for (i = 0; i < t1->w; ++i) {
- if (k + 3 < t1->h) {
- if (cblksty & J2K_CCP_CBLKSTY_VSC) {
- 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_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT |
- T1_SIG_OTH));
- } else {
- agg = !((MACRO_t1_flags(1 + k, 1 + i) |
- MACRO_t1_flags(1 + k + 1, 1 + i) |
- MACRO_t1_flags(1 + k + 2, 1 + i) |
- MACRO_t1_flags(1 + k + 3, 1 + i)) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
- }
+ if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+ /* XXX:TODO this needs implementing */
+ agg = !(MACRO_t1_enc_flags(1 + k, 1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+ || MACRO_t1_enc_flags(1 + k + 1, 1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+ || MACRO_t1_enc_flags(1 + k + 2, 1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+ || (MACRO_t1_enc_flags(1 + k + 3, 1 + i)
+ & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT |
+ T1_SIG_OTH));
} else {
- agg = 0;
+ agg = !ENC_FLAGS(i, k);
}
if (agg) {
for (runlen = 0; runlen < 4; ++runlen) {
} 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->data_stride) + i],
- bpno,
- one,
- nmsedec,
- agg && (j == k + runlen),
- vsc);
- }
+ opj_t1_enc_clnpass_step(
+ t1,
+ &ENC_FLAGS(i, k),
+ &t1->data[((k + runlen) * t1->data_stride) + i],
+ orient,
+ bpno,
+ one,
+ nmsedec,
+ agg,
+ runlen,
+ i,
+ k);
}
}
}
+
#define MACRO_t1_flags_internal(x,y,flags_stride) t1->flags[((x)*(flags_stride))+(y)]
#define opj_t1_dec_clnpass_internal(consistency_check, t1, bpno, cblksty, w, h, flags_stride) \
OPJ_UINT32 w,
OPJ_UINT32 h)
{
+ size_t flagssize;
+
/* encoder uses tile buffer, so no need to allocate */
if (!t1->encoder) {
size_t datasize;
}
}
- {
- size_t flagssize;
-
- /* Overflow check */
- if (w > (0xFFFFFFFFU /* UINT32_MAX */ - 2U)) {
- /* FIXME event manager error callback */
- return OPJ_FALSE;
- }
- t1->flags_stride = w + 2U; /* can't be 0U */
+ /* Overflow check */
+ if (w > (0xFFFFFFFFU /* UINT32_MAX */ - 2U)) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
+ t1->flags_stride = w + 2U; /* can't be 0U */
#if (SIZE_MAX - 3U) < 0xFFFFFFFFU /* UINT32_MAX */
- /* Overflow check */
- if (h > (0xFFFFFFFFU /* UINT32_MAX */ - 3U)) {
- /* FIXME event manager error callback */
- return OPJ_FALSE;
- }
+ /* Overflow check */
+ if (h > (0xFFFFFFFFU /* UINT32_MAX */ - 3U)) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
#endif
- flagssize = (size_t)h + 3U;
+ if (!t1->encoder) {
+ flagssize = (size_t)h + 2U;
+ } else {
+ flagssize = (h + 3U) / 4U + 2U;
+ }
- /* Overflow check */
- if (flagssize > (SIZE_MAX / (size_t)t1->flags_stride)) {
- /* FIXME event manager error callback */
- return OPJ_FALSE;
- }
- flagssize *= (size_t)t1->flags_stride;
+ /* Overflow check */
+ if (flagssize > (SIZE_MAX / (size_t)t1->flags_stride)) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
+ flagssize *= (size_t)t1->flags_stride;
+
+ if (!t1->encoder) {
if (flagssize > (size_t)t1->flagssize) {
/* Overflow check */
return OPJ_FALSE;
}
#endif
- t1->flagssize = (OPJ_UINT32)flagssize;
}
+ t1->flagssize = (OPJ_UINT32)flagssize;
+
memset(t1->flags, 0, flagssize * sizeof(opj_flag_t));
- }
- if (!t1->encoder) {
+
size_t colflags_size = ((((size_t)h + 3U) / 4U) +
2U); /* Can't overflow, h checked against UINT32_MAX - 3U */
t1->colflags_size = (OPJ_UINT32)colflags_size;
}
memset(t1->colflags, 0, colflags_size * sizeof(opj_colflag_t));
+ } else {
+ /* BIG FAT XXX */
+ opj_flag_enc_t* p;
+ OPJ_UINT32 x;
+ OPJ_UINT32 flags_height = (h + 3U) / 4U;
+
+ if (flagssize > (size_t)t1->flagssize) {
+ /* Overflow check */
+ if (flagssize > (SIZE_MAX / sizeof(opj_flag_enc_t))) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
+ opj_aligned_free(t1->enc_flags);
+ t1->enc_flags = (opj_flag_enc_t*) opj_aligned_malloc(flagssize * sizeof(
+ opj_flag_enc_t));
+ if (!t1->enc_flags) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
+#if SIZE_MAX > 0xFFFFFFFFU /* UINT32_MAX */
+ /* TODO remove this if t1->flagssize type changes to size_t */
+ /* Overflow check */
+ if (flagssize > (size_t)0xFFFFFFFFU /* UINT32_MAX */) {
+ /* FIXME event manager error callback */
+ return OPJ_FALSE;
+ }
+#endif
+ }
+ t1->flagssize = (OPJ_UINT32)flagssize;
+
+ memset(t1->enc_flags, 0, flagssize * sizeof(opj_flag_enc_t));
+
+ p = &t1->enc_flags[0];
+ for (x = 0; x < t1->flags_stride; ++x) {
+ /* magic value to hopefully stop any passes being interested in this entry */
+ *p++ = (T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
+ }
+
+ p = &t1->enc_flags[((flags_height + 1) * t1->flags_stride)];
+ for (x = 0; x < t1->flags_stride; ++x) {
+ /* magic value to hopefully stop any passes being interested in this entry */
+ *p++ = (T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
+ }
+
+ if (h % 4) {
+ OPJ_UINT32 v = 0;
+ p = &t1->enc_flags[((flags_height) * t1->flags_stride)];
+ if (h % 4 == 1) {
+ v |= T1_PI_1 | T1_PI_2 | T1_PI_3;
+ } else if (h % 4 == 2) {
+ v |= T1_PI_2 | T1_PI_3;
+ } else if (h % 4 == 3) {
+ v |= T1_PI_3;
+ }
+ for (x = 0; x < t1->flags_stride; ++x) {
+ *p++ = v;
+ }
+ }
}
t1->w = w;
opj_aligned_free(p_t1->colflags);
p_t1->colflags = 00;
}
+
+ if (p_t1->enc_flags) {
+ opj_aligned_free(p_t1->enc_flags);
+ p_t1->enc_flags = 00;
+ }
opj_free(p_t1);
}
switch (passtype) {
case 0:
- opj_t1_enc_sigpass(t1, bpno, &nmsedec, type, cblksty);
+ opj_t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
break;
case 1:
opj_t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
break;
case 2:
- opj_t1_enc_clnpass(t1, bpno, &nmsedec, cblksty);
+ 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);
2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
};
+static const OPJ_BYTE lut_enc_ctxno_zc[2048] = {
+ 0, 1, 3, 3, 1, 2, 3, 3, 5, 6, 7, 7, 6, 6, 7, 7, 0, 1, 3, 3, 1, 2, 3, 3, 5, 6, 7, 7, 6, 6, 7, 7,
+ 5, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 2, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 2, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 0, 1, 5, 6, 1, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7, 0, 1, 5, 6, 1, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7,
+ 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7, 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7,
+ 1, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7, 1, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7,
+ 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7, 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7,
+ 5, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 5, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 1, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7, 1, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7,
+ 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7, 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7,
+ 2, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7, 2, 2, 6, 6, 2, 2, 6, 6, 3, 3, 7, 7, 3, 3, 7, 7,
+ 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7, 3, 3, 7, 7, 3, 3, 7, 7, 4, 4, 7, 7, 4, 4, 7, 7,
+ 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 6, 6, 8, 8, 6, 6, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8, 7, 7, 8, 8,
+ 0, 1, 3, 3, 1, 2, 3, 3, 5, 6, 7, 7, 6, 6, 7, 7, 0, 1, 3, 3, 1, 2, 3, 3, 5, 6, 7, 7, 6, 6, 7, 7,
+ 5, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 1, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 2, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 2, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7,
+ 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 4, 4, 3, 3, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 0, 3, 1, 4, 3, 6, 4, 7, 1, 4, 2, 5, 4, 7, 5, 7, 0, 3, 1, 4, 3, 6, 4, 7, 1, 4, 2, 5, 4, 7, 5, 7,
+ 1, 4, 2, 5, 4, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7, 1, 4, 2, 5, 4, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7,
+ 3, 6, 4, 7, 6, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 3, 6, 4, 7, 6, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8,
+ 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 1, 4, 2, 5, 4, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7, 1, 4, 2, 5, 4, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7,
+ 2, 5, 2, 5, 5, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7, 2, 5, 2, 5, 5, 7, 5, 7,
+ 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 3, 6, 4, 7, 6, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 3, 6, 4, 7, 6, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8,
+ 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 6, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 6, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8,
+ 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8,
+ 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 4, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8, 5, 7, 5, 7, 7, 8, 7, 8,
+ 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8,
+ 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8
+};
+
static const OPJ_BYTE lut_ctxno_sc[256] = {
0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd,
0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc,
0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
};
+static const OPJ_BYTE lut_enc_ctxno_sc[256] = {
+ 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0xc, 0xc, 0xd, 0xb, 0xc, 0xc, 0xd, 0xb,
+ 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0xc, 0xc, 0xb, 0xd, 0xc, 0xc, 0xb, 0xd,
+ 0xc, 0xc, 0xd, 0xd, 0xc, 0xc, 0xb, 0xb, 0xc, 0x9, 0xd, 0xa, 0x9, 0xc, 0xa, 0xb,
+ 0xc, 0xc, 0xb, 0xb, 0xc, 0xc, 0xd, 0xd, 0xc, 0x9, 0xb, 0xa, 0x9, 0xc, 0xa, 0xd,
+ 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0xc, 0xc, 0xd, 0xb, 0xc, 0xc, 0xd, 0xb,
+ 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0xc, 0xc, 0xb, 0xd, 0xc, 0xc, 0xb, 0xd,
+ 0xc, 0xc, 0xd, 0xd, 0xc, 0xc, 0xb, 0xb, 0xc, 0x9, 0xd, 0xa, 0x9, 0xc, 0xa, 0xb,
+ 0xc, 0xc, 0xb, 0xb, 0xc, 0xc, 0xd, 0xd, 0xc, 0x9, 0xb, 0xa, 0x9, 0xc, 0xa, 0xd,
+ 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xd, 0xb, 0xd, 0xb, 0xd, 0xb, 0xd, 0xb,
+ 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xd, 0xb, 0xc, 0xc, 0xd, 0xb, 0xc, 0xc,
+ 0xd, 0xd, 0xd, 0xd, 0xb, 0xb, 0xb, 0xb, 0xd, 0xa, 0xd, 0xa, 0xa, 0xb, 0xa, 0xb,
+ 0xd, 0xd, 0xc, 0xc, 0xb, 0xb, 0xc, 0xc, 0xd, 0xa, 0xc, 0x9, 0xa, 0xb, 0x9, 0xc,
+ 0xa, 0xa, 0x9, 0x9, 0xa, 0xa, 0x9, 0x9, 0xb, 0xd, 0xc, 0xc, 0xb, 0xd, 0xc, 0xc,
+ 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xb, 0xd, 0xb, 0xd, 0xb, 0xd, 0xb, 0xd,
+ 0xb, 0xb, 0xc, 0xc, 0xd, 0xd, 0xc, 0xc, 0xb, 0xa, 0xc, 0x9, 0xa, 0xd, 0x9, 0xc,
+ 0xb, 0xb, 0xb, 0xb, 0xd, 0xd, 0xd, 0xd, 0xb, 0xa, 0xb, 0xa, 0xa, 0xd, 0xa, 0xd
+};
+
static const OPJ_BYTE lut_spb[256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0,
0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
};
+static const OPJ_BYTE lut_enc_spb[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1,
+ 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1
+};
+
static const OPJ_INT16 lut_nmsedec_sig[1U << T1_NMSEDEC_BITS] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
projects / openjpeg.git / commitdiff