T1: use more compact flags to optimize cache usage in encoder passes. (#172)
Ported from Carl Hetherington work (actually through Matthieu Darbois's port on top of OpenJPEG 2.1.0) Can reduce total encoding time by 10-15% WARNING: VSC mode is not implemented, and so is a temporary regression that must be fixed.
This commit is contained in:
Even Rouault
parent
53d46fc733
commit
cd12414c6b
|
|
@ -12,6 +12,7 @@
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
* Copyright (c) 2003-2014, Antonin Descampe
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
|
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
|
||||||
|
* Copyright (c) 2012, Carl Hetherington
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -44,41 +45,43 @@
|
||||||
/** @defgroup T1 T1 - Implementation of the tier-1 coding */
|
/** @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 */
|
/** @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 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 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 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_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_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos);
|
||||||
static OPJ_INT16 opj_t1_getnmsedec_ref(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,
|
static INLINE void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s,
|
||||||
OPJ_UINT32 stride);
|
OPJ_UINT32 stride);
|
||||||
/**
|
/**
|
||||||
Encode significant pass
|
Encode significant pass
|
||||||
*/
|
*/
|
||||||
static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
|
static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
|
||||||
opj_flag_t *flagsp,
|
opj_flag_enc_t *flagsp,
|
||||||
OPJ_INT32 *datap,
|
OPJ_INT32 *datap,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
OPJ_INT32 one,
|
OPJ_INT32 one,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type,
|
||||||
OPJ_UINT32 vsc);
|
OPJ_UINT32 k);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Decode significant pass
|
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(
|
static INLINE void opj_t1_dec_sigpass_step_raw(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
|
|
@ -111,6 +114,7 @@ Encode significant pass
|
||||||
*/
|
*/
|
||||||
static void opj_t1_enc_sigpass(opj_t1_t *t1,
|
static void opj_t1_enc_sigpass(opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type,
|
||||||
OPJ_UINT32 cblksty);
|
OPJ_UINT32 cblksty);
|
||||||
|
|
@ -132,13 +136,12 @@ static void opj_t1_dec_sigpass_mqc_vsc(
|
||||||
Encode refinement pass
|
Encode refinement pass
|
||||||
*/
|
*/
|
||||||
static void opj_t1_enc_refpass_step(opj_t1_t *t1,
|
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 *datap,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
OPJ_INT32 one,
|
OPJ_INT32 one,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type);
|
||||||
OPJ_UINT32 vsc);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -164,15 +167,6 @@ static void opj_t1_dec_refpass_mqc_vsc(
|
||||||
/**
|
/**
|
||||||
Decode refinement pass
|
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(
|
static INLINE void opj_t1_dec_refpass_step_raw(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
|
|
@ -206,13 +200,16 @@ Encode clean-up pass
|
||||||
*/
|
*/
|
||||||
static void opj_t1_enc_clnpass_step(
|
static void opj_t1_enc_clnpass_step(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
opj_flag_t *flagsp,
|
opj_flag_enc_t *flagsp,
|
||||||
OPJ_INT32 *datap,
|
OPJ_INT32 *datap,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
OPJ_INT32 one,
|
OPJ_INT32 one,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_UINT32 partial,
|
OPJ_UINT32 agg,
|
||||||
OPJ_UINT32 vsc);
|
OPJ_UINT32 runlen,
|
||||||
|
OPJ_UINT32 x,
|
||||||
|
OPJ_UINT32 y);
|
||||||
/**
|
/**
|
||||||
Decode clean-up pass
|
Decode clean-up pass
|
||||||
*/
|
*/
|
||||||
|
|
@ -245,6 +242,7 @@ Encode clean-up pass
|
||||||
static void opj_t1_enc_clnpass(
|
static void opj_t1_enc_clnpass(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_UINT32 cblksty);
|
OPJ_UINT32 cblksty);
|
||||||
|
|
||||||
|
|
@ -297,16 +295,58 @@ static OPJ_BOOL opj_t1_allocate_buffers(opj_t1_t *t1,
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
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)
|
static OPJ_BYTE opj_t1_getctxno_zc(opj_mqc_t *mqc, OPJ_UINT32 f)
|
||||||
{
|
{
|
||||||
return mqc->lut_ctxno_zc_orient[(f & T1_SIG_OTH)];
|
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)
|
static OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f)
|
||||||
{
|
{
|
||||||
return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
|
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)
|
static OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f)
|
||||||
{
|
{
|
||||||
OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
|
OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
|
||||||
|
|
@ -314,6 +354,35 @@ static OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f)
|
||||||
return (tmp2);
|
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)
|
static OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f)
|
||||||
{
|
{
|
||||||
return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
|
return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
|
||||||
|
|
@ -337,6 +406,62 @@ static OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos)
|
||||||
return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
|
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,
|
static INLINE void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s,
|
||||||
OPJ_UINT32 stride)
|
OPJ_UINT32 stride)
|
||||||
{
|
{
|
||||||
|
|
@ -405,48 +530,64 @@ static INLINE void opj_t1_updateflagscolflags(opj_flag_t *flagsp,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
|
|
||||||
opj_flag_t *flagsp,
|
void opj_t1_enc_sigpass_step(opj_t1_t *t1,
|
||||||
OPJ_INT32 *datap,
|
opj_flag_enc_t *flagsp,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 *datap,
|
||||||
OPJ_INT32 one,
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 bpno,
|
||||||
OPJ_BYTE type,
|
OPJ_INT32 one,
|
||||||
OPJ_UINT32 vsc
|
OPJ_INT32 *nmsedec,
|
||||||
)
|
OPJ_BYTE type,
|
||||||
|
OPJ_UINT32 k
|
||||||
|
)
|
||||||
{
|
{
|
||||||
OPJ_INT32 v;
|
OPJ_INT32 v;
|
||||||
OPJ_UINT32 flag;
|
OPJ_UINT32 ci;
|
||||||
|
|
||||||
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
||||||
|
|
||||||
flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
|
if (*flagsp == 0U) {
|
||||||
T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
|
/* Nothing to do for any of the 4 data points */
|
||||||
if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
|
return;
|
||||||
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 */
|
for (ci = 0U; ci < 4U; ++ci) {
|
||||||
opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
|
/* XXX:TODO enc_flags_t and vsc mode a la
|
||||||
} else {
|
vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
|
||||||
opj_mqc_encode(mqc, (OPJ_UINT32)v);
|
flag = vsc ? ((*dec_flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*dec_flagsp);
|
||||||
}
|
*/
|
||||||
if (v) {
|
|
||||||
v = *datap < 0 ? 1 : 0;
|
OPJ_UINT32 const shift_flags = *flagsp >> (ci * 3U);
|
||||||
*nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap),
|
|
||||||
(OPJ_UINT32)(bpno));
|
if ((shift_flags & (T1_SIGMA_THIS | T1_PI_THIS)) == 0U &&
|
||||||
opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); /* ESSAI */
|
(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 */
|
if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
|
||||||
opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
|
opj_mqc_bypass_enc(mqc, v);
|
||||||
} else {
|
} 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(
|
static INLINE void opj_t1_dec_sigpass_step_raw(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
opj_flag_t *flagsp,
|
opj_flag_t *flagsp,
|
||||||
|
|
@ -548,35 +689,37 @@ static INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
|
||||||
} /* VSC and BYPASS by Antonin */
|
} /* VSC and BYPASS by Antonin */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void opj_t1_enc_sigpass(opj_t1_t *t1,
|
static void opj_t1_enc_sigpass(opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type,
|
||||||
OPJ_UINT32 cblksty
|
OPJ_UINT32 cblksty
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
OPJ_UINT32 i, j, k, vsc;
|
OPJ_UINT32 i, k;
|
||||||
OPJ_INT32 one;
|
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;
|
*nmsedec = 0;
|
||||||
one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
|
|
||||||
for (k = 0; k < t1->h; k += 4) {
|
for (k = 0; k < t1->h; k += 4) {
|
||||||
for (i = 0; i < t1->w; ++i) {
|
for (i = 0; i < t1->w; ++i) {
|
||||||
for (j = k; j < k + 4 && j < t1->h; ++j) {
|
opj_t1_enc_sigpass_step(
|
||||||
vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 ||
|
t1,
|
||||||
j == t1->h - 1)) ? 1 : 0;
|
f,
|
||||||
opj_t1_enc_sigpass_step(
|
&t1->data[(k * t1->data_stride) + i],
|
||||||
t1,
|
orient,
|
||||||
&t1->flags[((j + 1) * t1->flags_stride) + i + 1],
|
bpno,
|
||||||
&t1->data[(j * t1->data_stride) + i],
|
one,
|
||||||
bpno,
|
nmsedec,
|
||||||
one,
|
type, k);
|
||||||
nmsedec,
|
|
||||||
type,
|
++f;
|
||||||
vsc);
|
++d;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
f += extra;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -725,38 +868,53 @@ static void opj_t1_dec_sigpass_mqc_vsc(
|
||||||
}
|
}
|
||||||
} /* VSC and BYPASS by Antonin */
|
} /* VSC and BYPASS by Antonin */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void opj_t1_enc_refpass_step(opj_t1_t *t1,
|
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 *datap,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
OPJ_INT32 one,
|
OPJ_INT32 one,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type)
|
||||||
OPJ_UINT32 vsc)
|
|
||||||
{
|
{
|
||||||
OPJ_INT32 v;
|
OPJ_INT32 v;
|
||||||
OPJ_UINT32 flag;
|
OPJ_UINT32 ci;
|
||||||
|
|
||||||
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
||||||
|
|
||||||
flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
|
if ((*flagsp & (T1_SIGMA_4 | T1_SIGMA_7 | T1_SIGMA_10 | T1_SIGMA_13)) == 0) {
|
||||||
T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
|
/* none significant */
|
||||||
if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
|
return;
|
||||||
*nmsedec += opj_t1_getnmsedec_ref((OPJ_UINT32)opj_int_abs(*datap),
|
}
|
||||||
(OPJ_UINT32)(bpno));
|
if ((*flagsp & (T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3)) ==
|
||||||
v = (opj_int_abs(*datap) & one) ? 1 : 0;
|
(T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3)) {
|
||||||
opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */
|
/* all processed by sigpass */
|
||||||
if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */
|
return;
|
||||||
opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
|
}
|
||||||
} else {
|
|
||||||
opj_mqc_encode(mqc, (OPJ_UINT32)v);
|
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(
|
static INLINE void opj_t1_dec_refpass_step_raw(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
opj_colflag_t *colflagsp,
|
opj_colflag_t *colflagsp,
|
||||||
|
|
@ -852,7 +1010,6 @@ static INLINE void opj_t1_dec_refpass_step_mqc_vsc(
|
||||||
}
|
}
|
||||||
} /* VSC and BYPASS by Antonin */
|
} /* VSC and BYPASS by Antonin */
|
||||||
|
|
||||||
|
|
||||||
static void opj_t1_enc_refpass(
|
static void opj_t1_enc_refpass(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
|
|
@ -860,30 +1017,29 @@ static void opj_t1_enc_refpass(
|
||||||
OPJ_BYTE type,
|
OPJ_BYTE type,
|
||||||
OPJ_UINT32 cblksty)
|
OPJ_UINT32 cblksty)
|
||||||
{
|
{
|
||||||
OPJ_UINT32 i, j, k, vsc;
|
OPJ_UINT32 i, k;
|
||||||
OPJ_INT32 one;
|
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;
|
*nmsedec = 0;
|
||||||
one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
|
for (k = 0U; k < t1->h; k += 4U) {
|
||||||
for (k = 0; k < t1->h; k += 4) {
|
for (i = 0U; i < t1->w; ++i) {
|
||||||
for (i = 0; i < t1->w; ++i) {
|
opj_t1_enc_refpass_step(
|
||||||
for (j = k; j < k + 4 && j < t1->h; ++j) {
|
t1,
|
||||||
vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 ||
|
f,
|
||||||
j == t1->h - 1)) ? 1 : 0;
|
&t1->data[(k * t1->data_stride) + i],
|
||||||
opj_t1_enc_refpass_step(
|
bpno,
|
||||||
t1,
|
one,
|
||||||
&t1->flags[((j + 1) * t1->flags_stride) + i + 1],
|
nmsedec,
|
||||||
&t1->data[(j * t1->data_stride) + i],
|
type);
|
||||||
bpno,
|
++f;
|
||||||
one,
|
|
||||||
nmsedec,
|
|
||||||
type,
|
|
||||||
vsc);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
f += extra;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void opj_t1_dec_refpass_raw(
|
static void opj_t1_dec_refpass_raw(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno)
|
OPJ_INT32 bpno)
|
||||||
|
|
@ -1025,44 +1181,75 @@ static void opj_t1_dec_refpass_mqc_vsc(
|
||||||
}
|
}
|
||||||
} /* VSC and BYPASS by Antonin */
|
} /* VSC and BYPASS by Antonin */
|
||||||
|
|
||||||
|
|
||||||
static void opj_t1_enc_clnpass_step(
|
static void opj_t1_enc_clnpass_step(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
opj_flag_t *flagsp,
|
opj_flag_enc_t *flagsp,
|
||||||
OPJ_INT32 *datap,
|
OPJ_INT32 *datap,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
OPJ_INT32 one,
|
OPJ_INT32 one,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_UINT32 partial,
|
OPJ_UINT32 agg,
|
||||||
OPJ_UINT32 vsc)
|
OPJ_UINT32 runlen,
|
||||||
|
OPJ_UINT32 x,
|
||||||
|
OPJ_UINT32 y)
|
||||||
{
|
{
|
||||||
OPJ_INT32 v;
|
OPJ_INT32 v;
|
||||||
OPJ_UINT32 flag;
|
OPJ_UINT32 ci;
|
||||||
|
|
||||||
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
||||||
|
|
||||||
flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |
|
OPJ_UINT32 lim;
|
||||||
T1_SGN_S))) : (OPJ_UINT32)(*flagsp);
|
const OPJ_UINT32 check = (T1_SIGMA_4 | T1_SIGMA_7 | T1_SIGMA_10 | T1_SIGMA_13 |
|
||||||
if (partial) {
|
T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
|
||||||
goto LABEL_PARTIAL;
|
|
||||||
}
|
if ((*flagsp & check) == check) {
|
||||||
if (!(*flagsp & (T1_SIG | T1_VISIT))) {
|
if (runlen == 0) {
|
||||||
opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(mqc, flag));
|
*flagsp &= ~(T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3);
|
||||||
v = (opj_int_abs(*datap) & one) ? 1 : 0;
|
} else if (runlen == 1) {
|
||||||
opj_mqc_encode(mqc, (OPJ_UINT32)v);
|
*flagsp &= ~(T1_PI_1 | T1_PI_2 | T1_PI_3);
|
||||||
if (v) {
|
} else if (runlen == 2) {
|
||||||
LABEL_PARTIAL:
|
*flagsp &= ~(T1_PI_2 | T1_PI_3);
|
||||||
*nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap),
|
} else if (runlen == 3) {
|
||||||
(OPJ_UINT32)(bpno));
|
*flagsp &= ~(T1_PI_3);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
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_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(
|
static void opj_t1_dec_clnpass_step_partial(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
opj_flag_t *flagsp,
|
opj_flag_t *flagsp,
|
||||||
|
|
@ -1180,38 +1367,35 @@ LABEL_PARTIAL:
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define MACRO_t1_enc_flags(x,y) t1->enc_flags[((x)*(t1->flags_stride))+(y)]
|
||||||
|
|
||||||
static void opj_t1_enc_clnpass(
|
static void opj_t1_enc_clnpass(
|
||||||
opj_t1_t *t1,
|
opj_t1_t *t1,
|
||||||
OPJ_INT32 bpno,
|
OPJ_INT32 bpno,
|
||||||
|
OPJ_UINT32 orient,
|
||||||
OPJ_INT32 *nmsedec,
|
OPJ_INT32 *nmsedec,
|
||||||
OPJ_UINT32 cblksty)
|
OPJ_UINT32 cblksty)
|
||||||
{
|
{
|
||||||
OPJ_UINT32 i, j, k;
|
OPJ_UINT32 i, k;
|
||||||
OPJ_INT32 one;
|
const OPJ_INT32 one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
|
||||||
OPJ_UINT32 agg, runlen, vsc;
|
OPJ_UINT32 agg, runlen;
|
||||||
|
|
||||||
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
||||||
|
|
||||||
*nmsedec = 0;
|
*nmsedec = 0;
|
||||||
one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
|
|
||||||
for (k = 0; k < t1->h; k += 4) {
|
for (k = 0; k < t1->h; k += 4) {
|
||||||
for (i = 0; i < t1->w; ++i) {
|
for (i = 0; i < t1->w; ++i) {
|
||||||
if (k + 3 < t1->h) {
|
if (cblksty & J2K_CCP_CBLKSTY_VSC) {
|
||||||
if (cblksty & J2K_CCP_CBLKSTY_VSC) {
|
/* XXX:TODO this needs implementing */
|
||||||
agg = !(MACRO_t1_flags(1 + k, 1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
|
agg = !(MACRO_t1_enc_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_enc_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_enc_flags(1 + k + 2, 1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
|
||||||
|| (MACRO_t1_flags(1 + k + 3, 1 + i)
|
|| (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_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT |
|
||||||
T1_SIG_OTH));
|
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));
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
agg = 0;
|
agg = !ENC_FLAGS(i, k);
|
||||||
}
|
}
|
||||||
if (agg) {
|
if (agg) {
|
||||||
for (runlen = 0; runlen < 4; ++runlen) {
|
for (runlen = 0; runlen < 4; ++runlen) {
|
||||||
|
|
@ -1230,23 +1414,23 @@ static void opj_t1_enc_clnpass(
|
||||||
} else {
|
} else {
|
||||||
runlen = 0;
|
runlen = 0;
|
||||||
}
|
}
|
||||||
for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
|
opj_t1_enc_clnpass_step(
|
||||||
vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 ||
|
t1,
|
||||||
j == t1->h - 1)) ? 1 : 0;
|
&ENC_FLAGS(i, k),
|
||||||
opj_t1_enc_clnpass_step(
|
&t1->data[((k + runlen) * t1->data_stride) + i],
|
||||||
t1,
|
orient,
|
||||||
&t1->flags[((j + 1) * t1->flags_stride) + i + 1],
|
bpno,
|
||||||
&t1->data[(j * t1->data_stride) + i],
|
one,
|
||||||
bpno,
|
nmsedec,
|
||||||
one,
|
agg,
|
||||||
nmsedec,
|
runlen,
|
||||||
agg && (j == k + runlen),
|
i,
|
||||||
vsc);
|
k);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define MACRO_t1_flags_internal(x,y,flags_stride) t1->flags[((x)*(flags_stride))+(y)]
|
#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) \
|
#define opj_t1_dec_clnpass_internal(consistency_check, t1, bpno, cblksty, w, h, flags_stride) \
|
||||||
|
|
@ -1468,6 +1652,8 @@ static OPJ_BOOL opj_t1_allocate_buffers(
|
||||||
OPJ_UINT32 w,
|
OPJ_UINT32 w,
|
||||||
OPJ_UINT32 h)
|
OPJ_UINT32 h)
|
||||||
{
|
{
|
||||||
|
size_t flagssize;
|
||||||
|
|
||||||
/* encoder uses tile buffer, so no need to allocate */
|
/* encoder uses tile buffer, so no need to allocate */
|
||||||
if (!t1->encoder) {
|
if (!t1->encoder) {
|
||||||
size_t datasize;
|
size_t datasize;
|
||||||
|
|
@ -1510,31 +1696,34 @@ static OPJ_BOOL opj_t1_allocate_buffers(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
/* Overflow check */
|
||||||
size_t flagssize;
|
if (w > (0xFFFFFFFFU /* UINT32_MAX */ - 2U)) {
|
||||||
|
/* FIXME event manager error callback */
|
||||||
/* Overflow check */
|
return OPJ_FALSE;
|
||||||
if (w > (0xFFFFFFFFU /* UINT32_MAX */ - 2U)) {
|
}
|
||||||
/* FIXME event manager error callback */
|
t1->flags_stride = w + 2U; /* can't be 0U */
|
||||||
return OPJ_FALSE;
|
|
||||||
}
|
|
||||||
t1->flags_stride = w + 2U; /* can't be 0U */
|
|
||||||
|
|
||||||
#if (SIZE_MAX - 3U) < 0xFFFFFFFFU /* UINT32_MAX */
|
#if (SIZE_MAX - 3U) < 0xFFFFFFFFU /* UINT32_MAX */
|
||||||
/* Overflow check */
|
/* Overflow check */
|
||||||
if (h > (0xFFFFFFFFU /* UINT32_MAX */ - 3U)) {
|
if (h > (0xFFFFFFFFU /* UINT32_MAX */ - 3U)) {
|
||||||
/* FIXME event manager error callback */
|
/* FIXME event manager error callback */
|
||||||
return OPJ_FALSE;
|
return OPJ_FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
flagssize = (size_t)h + 3U;
|
if (!t1->encoder) {
|
||||||
|
flagssize = (size_t)h + 2U;
|
||||||
|
} else {
|
||||||
|
flagssize = (h + 3U) / 4U + 2U;
|
||||||
|
}
|
||||||
|
|
||||||
/* Overflow check */
|
/* Overflow check */
|
||||||
if (flagssize > (SIZE_MAX / (size_t)t1->flags_stride)) {
|
if (flagssize > (SIZE_MAX / (size_t)t1->flags_stride)) {
|
||||||
/* FIXME event manager error callback */
|
/* FIXME event manager error callback */
|
||||||
return OPJ_FALSE;
|
return OPJ_FALSE;
|
||||||
}
|
}
|
||||||
flagssize *= (size_t)t1->flags_stride;
|
flagssize *= (size_t)t1->flags_stride;
|
||||||
|
|
||||||
|
if (!t1->encoder) {
|
||||||
|
|
||||||
if (flagssize > (size_t)t1->flagssize) {
|
if (flagssize > (size_t)t1->flagssize) {
|
||||||
/* Overflow check */
|
/* Overflow check */
|
||||||
|
|
@ -1556,11 +1745,11 @@ static OPJ_BOOL opj_t1_allocate_buffers(
|
||||||
return OPJ_FALSE;
|
return OPJ_FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
t1->flagssize = (OPJ_UINT32)flagssize;
|
|
||||||
}
|
}
|
||||||
|
t1->flagssize = (OPJ_UINT32)flagssize;
|
||||||
|
|
||||||
memset(t1->flags, 0, flagssize * sizeof(opj_flag_t));
|
memset(t1->flags, 0, flagssize * sizeof(opj_flag_t));
|
||||||
}
|
|
||||||
if (!t1->encoder) {
|
|
||||||
size_t colflags_size = ((((size_t)h + 3U) / 4U) +
|
size_t colflags_size = ((((size_t)h + 3U) / 4U) +
|
||||||
2U); /* Can't overflow, h checked against UINT32_MAX - 3U */
|
2U); /* Can't overflow, h checked against UINT32_MAX - 3U */
|
||||||
|
|
||||||
|
|
@ -1595,6 +1784,64 @@ static OPJ_BOOL opj_t1_allocate_buffers(
|
||||||
t1->colflags_size = (OPJ_UINT32)colflags_size;
|
t1->colflags_size = (OPJ_UINT32)colflags_size;
|
||||||
}
|
}
|
||||||
memset(t1->colflags, 0, colflags_size * sizeof(opj_colflag_t));
|
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;
|
t1->w = w;
|
||||||
|
|
@ -1670,6 +1917,11 @@ void opj_t1_destroy(opj_t1_t *p_t1)
|
||||||
opj_aligned_free(p_t1->colflags);
|
opj_aligned_free(p_t1->colflags);
|
||||||
p_t1->colflags = 00;
|
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);
|
opj_free(p_t1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2146,13 +2398,13 @@ static void opj_t1_encode_cblk(opj_t1_t *t1,
|
||||||
|
|
||||||
switch (passtype) {
|
switch (passtype) {
|
||||||
case 0:
|
case 0:
|
||||||
opj_t1_enc_sigpass(t1, bpno, &nmsedec, type, cblksty);
|
opj_t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
opj_t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
|
opj_t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
|
||||||
break;
|
break;
|
||||||
case 2:
|
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) */
|
/* code switch SEGMARK (i.e. SEGSYM) */
|
||||||
if (cblksty & J2K_CCP_CBLKSTY_SEGSYM) {
|
if (cblksty & J2K_CCP_CBLKSTY_SEGSYM) {
|
||||||
opj_mqc_segmark_enc(mqc);
|
opj_mqc_segmark_enc(mqc);
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
* Copyright (c) 2003-2014, Antonin Descampe
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
|
* Copyright (c) 2012, Carl Hetherington
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -112,6 +113,101 @@ in T1.C are used by some function in TCD.C.
|
||||||
#define T1_COLFLAG_VISIT_ROW_3 (T1_COLFLAG_VISIT_ROW_0 << (3U * T1_COLFLAG_RBS))
|
#define T1_COLFLAG_VISIT_ROW_3 (T1_COLFLAG_VISIT_ROW_0 << (3U * T1_COLFLAG_RBS))
|
||||||
#define T1_COLFLAG_REFINE_ROW_3 (T1_COLFLAG_REFINE_ROW_0 << (3U * T1_COLFLAG_RBS))
|
#define T1_COLFLAG_REFINE_ROW_3 (T1_COLFLAG_REFINE_ROW_0 << (3U * T1_COLFLAG_RBS))
|
||||||
|
|
||||||
|
|
||||||
|
/* BEGINNING of flags that apply to opj_flag_enc_t */
|
||||||
|
/** We hold the state of individual data points for the T1 encoder using
|
||||||
|
* a single 32-bit flags word to hold the state of 4 data points. This corresponds
|
||||||
|
* to the 4-point-high columns that the data is processed in.
|
||||||
|
*
|
||||||
|
* These #defines declare the layout of a 32-bit flags word.
|
||||||
|
*
|
||||||
|
* This is currently done for encoding only.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define T1_SIGMA_0 (1U << 0)
|
||||||
|
#define T1_SIGMA_1 (1U << 1)
|
||||||
|
#define T1_SIGMA_2 (1U << 2)
|
||||||
|
#define T1_SIGMA_3 (1U << 3)
|
||||||
|
#define T1_SIGMA_4 (1U << 4)
|
||||||
|
#define T1_SIGMA_5 (1U << 5)
|
||||||
|
#define T1_SIGMA_6 (1U << 6)
|
||||||
|
#define T1_SIGMA_7 (1U << 7)
|
||||||
|
#define T1_SIGMA_8 (1U << 8)
|
||||||
|
#define T1_SIGMA_9 (1U << 9)
|
||||||
|
#define T1_SIGMA_10 (1U << 10)
|
||||||
|
#define T1_SIGMA_11 (1U << 11)
|
||||||
|
#define T1_SIGMA_12 (1U << 12)
|
||||||
|
#define T1_SIGMA_13 (1U << 13)
|
||||||
|
#define T1_SIGMA_14 (1U << 14)
|
||||||
|
#define T1_SIGMA_15 (1U << 15)
|
||||||
|
#define T1_SIGMA_16 (1U << 16)
|
||||||
|
#define T1_SIGMA_17 (1U << 17)
|
||||||
|
|
||||||
|
#define T1_CHI_0 (1U << 18)
|
||||||
|
#define T1_CHI_0_I 18
|
||||||
|
#define T1_CHI_1 (1U << 19)
|
||||||
|
#define T1_CHI_1_I 19
|
||||||
|
#define T1_MU_0 (1U << 20)
|
||||||
|
#define T1_PI_0 (1U << 21)
|
||||||
|
#define T1_CHI_2 (1U << 22)
|
||||||
|
#define T1_CHI_2_I 22
|
||||||
|
#define T1_MU_1 (1U << 23)
|
||||||
|
#define T1_PI_1 (1U << 24)
|
||||||
|
#define T1_CHI_3 (1U << 25)
|
||||||
|
#define T1_MU_2 (1U << 26)
|
||||||
|
#define T1_PI_2 (1U << 27)
|
||||||
|
#define T1_CHI_4 (1U << 28)
|
||||||
|
#define T1_MU_3 (1U << 29)
|
||||||
|
#define T1_PI_3 (1U << 30)
|
||||||
|
#define T1_CHI_5 (1U << 31)
|
||||||
|
|
||||||
|
|
||||||
|
/** As an example, the bits T1_SIGMA_3, T1_SIGMA_4 and T1_SIGMA_5
|
||||||
|
* indicate the significance state of the west neighbour of data point zero
|
||||||
|
* of our four, the point itself, and its east neighbour respectively.
|
||||||
|
* Many of the bits are arranged so that given a flags word, you can
|
||||||
|
* look at the values for the data point 0, then shift the flags
|
||||||
|
* word right by 3 bits and look at the same bit positions to see the
|
||||||
|
* values for data point 1.
|
||||||
|
*
|
||||||
|
* The #defines below help a bit with this; say you have a flags word
|
||||||
|
* f, you can do things like
|
||||||
|
*
|
||||||
|
* (f & T1_SIGMA_THIS)
|
||||||
|
*
|
||||||
|
* to see the significance bit of data point 0, then do
|
||||||
|
*
|
||||||
|
* ((f >> 3) & T1_SIGMA_THIS)
|
||||||
|
*
|
||||||
|
* to see the significance bit of data point 1.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define T1_SIGMA_NW T1_SIGMA_0
|
||||||
|
#define T1_SIGMA_N T1_SIGMA_1
|
||||||
|
#define T1_SIGMA_NE T1_SIGMA_2
|
||||||
|
#define T1_SIGMA_W T1_SIGMA_3
|
||||||
|
#define T1_SIGMA_THIS T1_SIGMA_4
|
||||||
|
#define T1_SIGMA_E T1_SIGMA_5
|
||||||
|
#define T1_SIGMA_SW T1_SIGMA_6
|
||||||
|
#define T1_SIGMA_S T1_SIGMA_7
|
||||||
|
#define T1_SIGMA_SE T1_SIGMA_8
|
||||||
|
#define T1_SIGMA_NEIGHBOURS (T1_SIGMA_NW | T1_SIGMA_N | T1_SIGMA_NE | T1_SIGMA_W | T1_SIGMA_E | T1_SIGMA_SW | T1_SIGMA_S | T1_SIGMA_SE)
|
||||||
|
|
||||||
|
#define T1_CHI_THIS T1_CHI_1
|
||||||
|
#define T1_CHI_THIS_I T1_CHI_1_I
|
||||||
|
#define T1_MU_THIS T1_MU_0
|
||||||
|
#define T1_PI_THIS T1_PI_0
|
||||||
|
|
||||||
|
#define T1_LUT_SGN_W (1U << 0)
|
||||||
|
#define T1_LUT_SIG_N (1U << 1)
|
||||||
|
#define T1_LUT_SGN_E (1U << 2)
|
||||||
|
#define T1_LUT_SIG_W (1U << 3)
|
||||||
|
#define T1_LUT_SGN_N (1U << 4)
|
||||||
|
#define T1_LUT_SIG_E (1U << 5)
|
||||||
|
#define T1_LUT_SGN_S (1U << 6)
|
||||||
|
#define T1_LUT_SIG_S (1U << 7)
|
||||||
|
/* END of flags that apply to opj_flag_enc_t */
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
|
|
||||||
typedef OPJ_UINT16 opj_flag_t;
|
typedef OPJ_UINT16 opj_flag_t;
|
||||||
|
|
@ -119,6 +215,8 @@ typedef OPJ_UINT16 opj_flag_t;
|
||||||
/** Flags for 4 consecutive rows of a column */
|
/** Flags for 4 consecutive rows of a column */
|
||||||
typedef OPJ_UINT16 opj_colflag_t;
|
typedef OPJ_UINT16 opj_colflag_t;
|
||||||
|
|
||||||
|
typedef OPJ_UINT32 opj_flag_enc_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Tier-1 coding (coding of code-block coefficients)
|
Tier-1 coding (coding of code-block coefficients)
|
||||||
*/
|
*/
|
||||||
|
|
@ -130,12 +228,15 @@ typedef struct opj_t1 {
|
||||||
opj_raw_t *raw;
|
opj_raw_t *raw;
|
||||||
|
|
||||||
OPJ_INT32 *data;
|
OPJ_INT32 *data;
|
||||||
|
/** Flags used by decoder */
|
||||||
opj_flag_t *flags;
|
opj_flag_t *flags;
|
||||||
/** Addition flag array such that colflags[1+0] is for state of col=0,row=0..3,
|
/** Addition flag array such that colflags[1+0] is for state of col=0,row=0..3,
|
||||||
colflags[1+1] for col=1, row=0..3, colflags[1+flags_stride] for col=0,row=4..7, ...
|
colflags[1+1] for col=1, row=0..3, colflags[1+flags_stride] for col=0,row=4..7, ...
|
||||||
This array avoids too much cache trashing when processing by 4 vertical samples
|
This array avoids too much cache trashing when processing by 4 vertical samples
|
||||||
as done in the various decoding steps. */
|
as done in the various decoding steps. */
|
||||||
opj_colflag_t* colflags;
|
opj_colflag_t* colflags;
|
||||||
|
/** Flags used by encoder */
|
||||||
|
opj_flag_enc_t *enc_flags;
|
||||||
OPJ_UINT32 w;
|
OPJ_UINT32 w;
|
||||||
OPJ_UINT32 h;
|
OPJ_UINT32 h;
|
||||||
OPJ_UINT32 datasize;
|
OPJ_UINT32 datasize;
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
* Copyright (c) 2003-2014, Antonin Descampe
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
|
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
|
||||||
|
* Copyright (c) 2012, Carl Hetherington
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -118,6 +119,83 @@ static int t1_init_ctxno_zc(unsigned int f, unsigned int orient)
|
||||||
return (T1_CTXNO_ZC + n);
|
return (T1_CTXNO_ZC + n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int t1_init_enc_ctxno_zc(int f, int orient)
|
||||||
|
{
|
||||||
|
int h, v, d, n, t, hv;
|
||||||
|
n = 0;
|
||||||
|
h = ((f & T1_SIGMA_3) != 0) + ((f & T1_SIGMA_5) != 0);
|
||||||
|
v = ((f & T1_SIGMA_1) != 0) + ((f & T1_SIGMA_7) != 0);
|
||||||
|
d = ((f & T1_SIGMA_0) != 0) + ((f & T1_SIGMA_2) != 0) + ((
|
||||||
|
f & T1_SIGMA_8) != 0) + ((f & T1_SIGMA_6) != 0);
|
||||||
|
|
||||||
|
switch (orient) {
|
||||||
|
case 2:
|
||||||
|
t = h;
|
||||||
|
h = v;
|
||||||
|
v = t;
|
||||||
|
case 0:
|
||||||
|
case 1:
|
||||||
|
if (!h) {
|
||||||
|
if (!v) {
|
||||||
|
if (!d) {
|
||||||
|
n = 0;
|
||||||
|
} else if (d == 1) {
|
||||||
|
n = 1;
|
||||||
|
} else {
|
||||||
|
n = 2;
|
||||||
|
}
|
||||||
|
} else if (v == 1) {
|
||||||
|
n = 3;
|
||||||
|
} else {
|
||||||
|
n = 4;
|
||||||
|
}
|
||||||
|
} else if (h == 1) {
|
||||||
|
if (!v) {
|
||||||
|
if (!d) {
|
||||||
|
n = 5;
|
||||||
|
} else {
|
||||||
|
n = 6;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
n = 7;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
n = 8;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
hv = h + v;
|
||||||
|
if (!d) {
|
||||||
|
if (!hv) {
|
||||||
|
n = 0;
|
||||||
|
} else if (hv == 1) {
|
||||||
|
n = 1;
|
||||||
|
} else {
|
||||||
|
n = 2;
|
||||||
|
}
|
||||||
|
} else if (d == 1) {
|
||||||
|
if (!hv) {
|
||||||
|
n = 3;
|
||||||
|
} else if (hv == 1) {
|
||||||
|
n = 4;
|
||||||
|
} else {
|
||||||
|
n = 5;
|
||||||
|
}
|
||||||
|
} else if (d == 2) {
|
||||||
|
if (!hv) {
|
||||||
|
n = 6;
|
||||||
|
} else {
|
||||||
|
n = 7;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
n = 8;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (T1_CTXNO_ZC + n);
|
||||||
|
}
|
||||||
|
|
||||||
static int t1_init_ctxno_sc(unsigned int f)
|
static int t1_init_ctxno_sc(unsigned int f)
|
||||||
{
|
{
|
||||||
int hc, vc, n;
|
int hc, vc, n;
|
||||||
|
|
@ -162,6 +240,50 @@ static int t1_init_ctxno_sc(unsigned int f)
|
||||||
return (T1_CTXNO_SC + n);
|
return (T1_CTXNO_SC + n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int t1_init_enc_ctxno_sc(int f)
|
||||||
|
{
|
||||||
|
int hc, vc, n;
|
||||||
|
n = 0;
|
||||||
|
|
||||||
|
hc = opj_int_min(((f & (T1_LUT_SIG_E | T1_LUT_SGN_E)) ==
|
||||||
|
T1_LUT_SIG_E) + ((f & (T1_LUT_SIG_W | T1_LUT_SGN_W)) == T1_LUT_SIG_W),
|
||||||
|
1) - opj_int_min(((f & (T1_LUT_SIG_E | T1_LUT_SGN_E)) ==
|
||||||
|
(T1_LUT_SIG_E | T1_LUT_SGN_E)) +
|
||||||
|
((f & (T1_LUT_SIG_W | T1_LUT_SGN_W)) ==
|
||||||
|
(T1_LUT_SIG_W | T1_LUT_SGN_W)), 1);
|
||||||
|
|
||||||
|
vc = opj_int_min(((f & (T1_LUT_SIG_N | T1_LUT_SGN_N)) ==
|
||||||
|
T1_LUT_SIG_N) + ((f & (T1_LUT_SIG_S | T1_LUT_SGN_S)) == T1_LUT_SIG_S),
|
||||||
|
1) - opj_int_min(((f & (T1_LUT_SIG_N | T1_LUT_SGN_N)) ==
|
||||||
|
(T1_LUT_SIG_N | T1_LUT_SGN_N)) +
|
||||||
|
((f & (T1_LUT_SIG_S | T1_LUT_SGN_S)) ==
|
||||||
|
(T1_LUT_SIG_S | T1_LUT_SGN_S)), 1);
|
||||||
|
|
||||||
|
if (hc < 0) {
|
||||||
|
hc = -hc;
|
||||||
|
vc = -vc;
|
||||||
|
}
|
||||||
|
if (!hc) {
|
||||||
|
if (vc == -1) {
|
||||||
|
n = 1;
|
||||||
|
} else if (!vc) {
|
||||||
|
n = 0;
|
||||||
|
} else {
|
||||||
|
n = 1;
|
||||||
|
}
|
||||||
|
} else if (hc == 1) {
|
||||||
|
if (vc == -1) {
|
||||||
|
n = 2;
|
||||||
|
} else if (!vc) {
|
||||||
|
n = 3;
|
||||||
|
} else {
|
||||||
|
n = 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (T1_CTXNO_SC + n);
|
||||||
|
}
|
||||||
|
|
||||||
static int t1_init_spb(unsigned int f)
|
static int t1_init_spb(unsigned int f)
|
||||||
{
|
{
|
||||||
int hc, vc, n;
|
int hc, vc, n;
|
||||||
|
|
@ -189,14 +311,43 @@ static int t1_init_spb(unsigned int f)
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int t1_init_enc_spb(int f)
|
||||||
|
{
|
||||||
|
int hc, vc, n;
|
||||||
|
|
||||||
|
hc = opj_int_min(((f & (T1_LUT_SIG_E | T1_LUT_SGN_E)) ==
|
||||||
|
T1_LUT_SIG_E) + ((f & (T1_LUT_SIG_W | T1_LUT_SGN_W)) == T1_LUT_SIG_W),
|
||||||
|
1) - opj_int_min(((f & (T1_LUT_SIG_E | T1_LUT_SGN_E)) ==
|
||||||
|
(T1_LUT_SIG_E | T1_LUT_SGN_E)) +
|
||||||
|
((f & (T1_LUT_SIG_W | T1_LUT_SGN_W)) ==
|
||||||
|
(T1_LUT_SIG_W | T1_LUT_SGN_W)), 1);
|
||||||
|
|
||||||
|
vc = opj_int_min(((f & (T1_LUT_SIG_N | T1_LUT_SGN_N)) ==
|
||||||
|
T1_LUT_SIG_N) + ((f & (T1_LUT_SIG_S | T1_LUT_SGN_S)) == T1_LUT_SIG_S),
|
||||||
|
1) - opj_int_min(((f & (T1_LUT_SIG_N | T1_LUT_SGN_N)) ==
|
||||||
|
(T1_LUT_SIG_N | T1_LUT_SGN_N)) +
|
||||||
|
((f & (T1_LUT_SIG_S | T1_LUT_SGN_S)) ==
|
||||||
|
(T1_LUT_SIG_S | T1_LUT_SGN_S)), 1);
|
||||||
|
|
||||||
|
if (!hc && !vc) {
|
||||||
|
n = 0;
|
||||||
|
} else {
|
||||||
|
n = (!(hc > 0 || (!hc && vc > 0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
static void dump_array16(int array[], int size)
|
static void dump_array16(int array[], int size)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
--size;
|
--size;
|
||||||
for (i = 0; i < size; ++i) {
|
for (i = 0; i < size; ++i) {
|
||||||
printf("0x%04x, ", array[i]);
|
printf("0x%04x,", array[i]);
|
||||||
if (!((i + 1) & 0x7)) {
|
if (!((i + 1) & 0x7)) {
|
||||||
printf("\n ");
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("0x%04x\n};\n\n", array[size]);
|
printf("0x%04x\n};\n\n", array[size]);
|
||||||
|
|
@ -208,6 +359,7 @@ int main(int argc, char **argv)
|
||||||
double u, v, t;
|
double u, v, t;
|
||||||
|
|
||||||
int lut_ctxno_zc[1024];
|
int lut_ctxno_zc[1024];
|
||||||
|
int lut_enc_ctxno_zc[2048];
|
||||||
int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
|
int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
|
||||||
int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
|
int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
|
||||||
int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
|
int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
|
||||||
|
|
@ -230,35 +382,89 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("static const OPJ_BYTE lut_ctxno_zc[1024] = {\n ");
|
printf("static const OPJ_BYTE lut_ctxno_zc[1024] = {\n ");
|
||||||
for (i = 0U; i < 1023U; ++i) {
|
for (i = 0U; i < 1023U; ++i) {
|
||||||
printf("%i, ", lut_ctxno_zc[i]);
|
printf("%i,", lut_ctxno_zc[i]);
|
||||||
if (!((i + 1U) & 0x1fU)) {
|
if (!((i + 1U) & 0x1fU)) {
|
||||||
printf("\n ");
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("%i\n};\n\n", lut_ctxno_zc[1023]);
|
printf("%i\n};\n\n", lut_ctxno_zc[1023]);
|
||||||
|
|
||||||
|
/* lut_enc_ctxno_zc */
|
||||||
|
for (j = 0; j < 4; ++j) {
|
||||||
|
for (i = 0; i < 512; ++i) {
|
||||||
|
int orient = j;
|
||||||
|
if (orient == 2) {
|
||||||
|
orient = 1;
|
||||||
|
} else if (orient == 1) {
|
||||||
|
orient = 2;
|
||||||
|
}
|
||||||
|
lut_enc_ctxno_zc[(orient << 9) | i] = t1_init_enc_ctxno_zc(i, j);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("static const OPJ_BYTE lut_enc_ctxno_zc[2048] = {\n ");
|
||||||
|
for (i = 0; i < 2047; ++i) {
|
||||||
|
printf("%i,", lut_enc_ctxno_zc[i]);
|
||||||
|
if (!((i + 1) & 0x1f)) {
|
||||||
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("%i\n};\n\n", lut_enc_ctxno_zc[2047]);
|
||||||
|
|
||||||
/* lut_ctxno_sc */
|
/* lut_ctxno_sc */
|
||||||
printf("static const OPJ_BYTE lut_ctxno_sc[256] = {\n ");
|
printf("static const OPJ_BYTE lut_ctxno_sc[256] = {\n ");
|
||||||
for (i = 0U; i < 255U; ++i) {
|
for (i = 0U; i < 255U; ++i) {
|
||||||
printf("0x%x, ", t1_init_ctxno_sc(i << 4));
|
printf("0x%x,", t1_init_ctxno_sc(i << 4));
|
||||||
if (!((i + 1U) & 0xfU)) {
|
if (!((i + 1U) & 0xfU)) {
|
||||||
printf("\n ");
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("0x%x\n};\n\n", t1_init_ctxno_sc(255U << 4));
|
printf("0x%x\n};\n\n", t1_init_ctxno_sc(255U << 4));
|
||||||
|
|
||||||
|
/* lut_enc_ctxno_sc */
|
||||||
|
printf("static const OPJ_BYTE lut_enc_ctxno_sc[256] = {\n ");
|
||||||
|
for (i = 0; i < 255; ++i) {
|
||||||
|
printf("0x%x,", t1_init_enc_ctxno_sc(i));
|
||||||
|
if (!((i + 1) & 0xf)) {
|
||||||
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("0x%x\n};\n\n", t1_init_enc_ctxno_sc(255));
|
||||||
|
|
||||||
/* lut_spb */
|
/* lut_spb */
|
||||||
printf("static const OPJ_BYTE lut_spb[256] = {\n ");
|
printf("static const OPJ_BYTE lut_spb[256] = {\n ");
|
||||||
for (i = 0U; i < 255U; ++i) {
|
for (i = 0U; i < 255U; ++i) {
|
||||||
printf("%i, ", t1_init_spb(i << 4));
|
printf("%i,", t1_init_spb(i << 4));
|
||||||
if (!((i + 1U) & 0x1fU)) {
|
if (!((i + 1U) & 0x1fU)) {
|
||||||
printf("\n ");
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("%i\n};\n\n", t1_init_spb(255U << 4));
|
printf("%i\n};\n\n", t1_init_spb(255U << 4));
|
||||||
|
|
||||||
|
/* lut_enc_spb */
|
||||||
|
printf("static const OPJ_BYTE lut_enc_spb[256] = {\n ");
|
||||||
|
for (i = 0; i < 255; ++i) {
|
||||||
|
printf("%i,", t1_init_enc_spb(i));
|
||||||
|
if (!((i + 1) & 0x1f)) {
|
||||||
|
printf("\n ");
|
||||||
|
} else {
|
||||||
|
printf(" ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("%i\n};\n\n", t1_init_enc_spb(255));
|
||||||
|
|
||||||
/* FIXME FIXME FIXME */
|
/* FIXME FIXME FIXME */
|
||||||
/* fprintf(stdout,"nmsedec luts:\n"); */
|
/* fprintf(stdout,"nmsedec luts:\n"); */
|
||||||
for (i = 0U; i < (1U << T1_NMSEDEC_BITS); ++i) {
|
for (i = 0U; i < (1U << T1_NMSEDEC_BITS); ++i) {
|
||||||
|
|
@ -289,16 +495,16 @@ int main(int argc, char **argv)
|
||||||
T1_NMSEDEC_FRACBITS) * 8192.0));
|
T1_NMSEDEC_FRACBITS) * 8192.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("static const OPJ_INT16 lut_nmsedec_sig[1U << T1_NMSEDEC_BITS] = {\n ");
|
printf("static const OPJ_INT16 lut_nmsedec_sig[1U << T1_NMSEDEC_BITS] = {\n ");
|
||||||
dump_array16(lut_nmsedec_sig, 1U << T1_NMSEDEC_BITS);
|
dump_array16(lut_nmsedec_sig, 1U << T1_NMSEDEC_BITS);
|
||||||
|
|
||||||
printf("static const OPJ_INT16 lut_nmsedec_sig0[1U << T1_NMSEDEC_BITS] = {\n ");
|
printf("static const OPJ_INT16 lut_nmsedec_sig0[1U << T1_NMSEDEC_BITS] = {\n ");
|
||||||
dump_array16(lut_nmsedec_sig0, 1U << T1_NMSEDEC_BITS);
|
dump_array16(lut_nmsedec_sig0, 1U << T1_NMSEDEC_BITS);
|
||||||
|
|
||||||
printf("static const OPJ_INT16 lut_nmsedec_ref[1U << T1_NMSEDEC_BITS] = {\n ");
|
printf("static const OPJ_INT16 lut_nmsedec_ref[1U << T1_NMSEDEC_BITS] = {\n ");
|
||||||
dump_array16(lut_nmsedec_ref, 1U << T1_NMSEDEC_BITS);
|
dump_array16(lut_nmsedec_ref, 1U << T1_NMSEDEC_BITS);
|
||||||
|
|
||||||
printf("static const OPJ_INT16 lut_nmsedec_ref0[1U << T1_NMSEDEC_BITS] = {\n ");
|
printf("static const OPJ_INT16 lut_nmsedec_ref0[1U << T1_NMSEDEC_BITS] = {\n ");
|
||||||
dump_array16(lut_nmsedec_ref0, 1U << T1_NMSEDEC_BITS);
|
dump_array16(lut_nmsedec_ref0, 1U << T1_NMSEDEC_BITS);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,73 @@ static const OPJ_BYTE lut_ctxno_zc[1024] = {
|
||||||
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
|
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] = {
|
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, 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, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc,
|
||||||
|
|
@ -54,6 +121,25 @@ 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, 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] = {
|
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, 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, 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,
|
||||||
|
|
@ -65,6 +151,17 @@ static const OPJ_BYTE lut_spb[256] = {
|
||||||
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
|
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] = {
|
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,
|
||||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue