/**
Decode significant pass
*/
+#if 0
static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
opj_flag_t *flagsp,
OPJ_INT32 *datap,
OPJ_INT32 oneplushalf,
OPJ_BYTE type,
OPJ_UINT32 vsc);
+#endif
static INLINE void opj_t1_dec_sigpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int vsc);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 vsc);
static INLINE void opj_t1_dec_sigpass_step_mqc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf);
static INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int vsc);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 vsc);
/**
/**
Decode significant pass
*/
-static void opj_t1_dec_sigpass( opj_t1_t *t1,
- OPJ_INT32 bpno,
- OPJ_UINT32 orient,
- OPJ_BYTE type,
- OPJ_UINT32 cblksty);
-
static void opj_t1_dec_sigpass_raw(
opj_t1_t *t1,
- int bpno,
- int orient,
- int cblksty);
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient,
+ OPJ_INT32 cblksty);
static void opj_t1_dec_sigpass_mqc(
opj_t1_t *t1,
- int bpno,
- int orient);
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient);
static void opj_t1_dec_sigpass_mqc_vsc(
opj_t1_t *t1,
- int bpno,
- int orient);
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient);
/**
Decode refinement pass
*/
-static void opj_t1_dec_refpass( opj_t1_t *t1,
- OPJ_INT32 bpno,
- OPJ_BYTE type,
- OPJ_UINT32 cblksty);
static void opj_t1_dec_refpass_raw(
opj_t1_t *t1,
- int bpno,
- int cblksty);
+ OPJ_INT32 bpno,
+ OPJ_INT32 cblksty);
static void opj_t1_dec_refpass_mqc(
opj_t1_t *t1,
- int bpno);
+ OPJ_INT32 bpno);
static void opj_t1_dec_refpass_mqc_vsc(
opj_t1_t *t1,
- int bpno);
+ OPJ_INT32 bpno);
/**
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 neghalf,
OPJ_BYTE type,
OPJ_UINT32 vsc);
+#endif
-static void INLINE opj_t1_dec_refpass_step_raw(
+static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf,
- int vsc);
-static void INLINE opj_t1_dec_refpass_step_mqc(
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf,
+ OPJ_INT32 vsc);
+static INLINE void opj_t1_dec_refpass_step_mqc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf);
-static void INLINE opj_t1_dec_refpass_step_mqc_vsc(
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf);
+static INLINE void opj_t1_dec_refpass_step_mqc_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf,
- int vsc);
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf,
+ OPJ_INT32 vsc);
static void opj_t1_dec_clnpass_step_partial(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf);
static void opj_t1_dec_clnpass_step(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf);
static void opj_t1_dec_clnpass_step_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int partial,
- int vsc);
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 partial,
+ OPJ_INT32 vsc);
/**
Encode clean-up pass
*/
*/
static void opj_t1_dec_clnpass(
opj_t1_t *t1,
- int bpno,
- int orient,
- int cblksty);
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient,
+ OPJ_INT32 cblksty);
static OPJ_FLOAT64 opj_t1_getwmsedec(
OPJ_INT32 nmsedec,
@param roishift Region of interest shifting value
@param cblksty Code-block style
*/
-static opj_bool opj_t1_decode_cblk( opj_t1_t *t1,
+static OPJ_BOOL opj_t1_decode_cblk( opj_t1_t *t1,
opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 orient,
OPJ_UINT32 roishift,
OPJ_UINT32 cblksty);
-opj_bool opj_t1_allocate_buffers( opj_t1_t *t1,
+OPJ_BOOL opj_t1_allocate_buffers( opj_t1_t *t1,
OPJ_UINT32 w,
OPJ_UINT32 h);
static INLINE void opj_t1_dec_sigpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int vsc)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 vsc)
{
- int v, flag;
-
+ OPJ_INT32 v, flag;
opj_raw_t *raw = t1->raw; /* RAW component */
+ OPJ_ARG_NOT_USED(orient);
flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
INLINE void opj_t1_dec_sigpass_step_mqc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf)
{
- int v, flag;
+ OPJ_INT32 v, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int vsc)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 vsc)
{
- int v, flag;
+ OPJ_INT32 v, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
void opj_t1_dec_sigpass_raw(
opj_t1_t *t1,
- int bpno,
- int orient,
- int cblksty)
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient,
+ OPJ_INT32 cblksty)
{
- int one, half, oneplushalf, vsc;
+ OPJ_INT32 one, half, oneplushalf, vsc;
OPJ_UINT32 i, j, k;
one = 1 << bpno;
half = one >> 1;
void opj_t1_dec_sigpass_mqc(
opj_t1_t *t1,
- int bpno,
- int orient)
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient)
{
- int one, half, oneplushalf;
+ OPJ_INT32 one, half, oneplushalf;
OPJ_UINT32 i, j, k;
- int *data1 = t1->data;
+ OPJ_INT32 *data1 = t1->data;
opj_flag_t *flags1 = &t1->flags[1];
one = 1 << bpno;
half = one >> 1;
oneplushalf = one | half;
for (k = 0; k < (t1->h & ~3); k += 4) {
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
flags2 += t1->flags_stride;
opj_t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
flags1 += t1->flags_stride << 2;
}
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
for (j = k; j < t1->h; ++j) {
flags2 += t1->flags_stride;
void opj_t1_dec_sigpass_mqc_vsc(
opj_t1_t *t1,
- int bpno,
- int orient)
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient)
{
- int one, half, oneplushalf, vsc;
+ OPJ_INT32 one, half, oneplushalf, vsc;
OPJ_UINT32 i, j, k;
one = 1 << bpno;
half = one >> 1;
INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf,
- int vsc)
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf,
+ OPJ_INT32 vsc)
{
- int v, t, flag;
+ OPJ_INT32 v, t, flag;
opj_raw_t *raw = t1->raw; /* RAW component */
INLINE void opj_t1_dec_refpass_step_mqc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf)
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf)
{
- int v, t, flag;
+ OPJ_INT32 v, t, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
INLINE void opj_t1_dec_refpass_step_mqc_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int poshalf,
- int neghalf,
- int vsc)
+ OPJ_INT32 *datap,
+ OPJ_INT32 poshalf,
+ OPJ_INT32 neghalf,
+ OPJ_INT32 vsc)
{
- int v, t, flag;
+ OPJ_INT32 v, t, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
void opj_t1_dec_refpass_raw(
opj_t1_t *t1,
- int bpno,
- int cblksty)
+ OPJ_INT32 bpno,
+ OPJ_INT32 cblksty)
{
- int one, poshalf, neghalf;
+ OPJ_INT32 one, poshalf, neghalf;
OPJ_UINT32 i, j, k;
- int vsc;
+ OPJ_INT32 vsc;
one = 1 << bpno;
poshalf = one >> 1;
neghalf = bpno > 0 ? -poshalf : -1;
void opj_t1_dec_refpass_mqc(
opj_t1_t *t1,
- int bpno)
+ OPJ_INT32 bpno)
{
- int one, poshalf, neghalf;
+ OPJ_INT32 one, poshalf, neghalf;
OPJ_UINT32 i, j, k;
- int *data1 = t1->data;
+ OPJ_INT32 *data1 = t1->data;
opj_flag_t *flags1 = &t1->flags[1];
one = 1 << bpno;
poshalf = one >> 1;
neghalf = bpno > 0 ? -poshalf : -1;
for (k = 0; k < (t1->h & ~3); k += 4) {
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
flags2 += t1->flags_stride;
opj_t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
flags1 += t1->flags_stride << 2;
}
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
for (j = k; j < t1->h; ++j) {
flags2 += t1->flags_stride;
void opj_t1_dec_refpass_mqc_vsc(
opj_t1_t *t1,
- int bpno)
+ OPJ_INT32 bpno)
{
- int one, poshalf, neghalf;
+ OPJ_INT32 one, poshalf, neghalf;
OPJ_UINT32 i, j, k;
- int vsc;
+ OPJ_INT32 vsc;
one = 1 << bpno;
poshalf = one >> 1;
neghalf = bpno > 0 ? -poshalf : -1;
static void opj_t1_dec_clnpass_step_partial(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf)
{
- int v, flag;
+ OPJ_INT32 v, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
OPJ_ARG_NOT_USED(orient);
static void opj_t1_dec_clnpass_step(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf)
{
- int v, flag;
+ OPJ_INT32 v, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
static void opj_t1_dec_clnpass_step_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
- int *datap,
- int orient,
- int oneplushalf,
- int partial,
- int vsc)
+ OPJ_INT32 *datap,
+ OPJ_INT32 orient,
+ OPJ_INT32 oneplushalf,
+ OPJ_INT32 partial,
+ OPJ_INT32 vsc)
{
- int v, flag;
+ OPJ_INT32 v, flag;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
static void opj_t1_dec_clnpass(
opj_t1_t *t1,
- int bpno,
- int orient,
- int cblksty)
+ OPJ_INT32 bpno,
+ OPJ_INT32 orient,
+ OPJ_INT32 cblksty)
{
- int one, half, oneplushalf, agg, runlen, vsc;
+ OPJ_INT32 one, half, oneplushalf, agg, runlen, vsc;
OPJ_UINT32 i, j, k;
- int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
+ OPJ_INT32 segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
}
}
} else {
- int *data1 = t1->data;
+ OPJ_INT32 *data1 = t1->data;
opj_flag_t *flags1 = &t1->flags[1];
for (k = 0; k < (t1->h & ~3); k += 4) {
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
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)
flags1 += t1->flags_stride << 2;
}
for (i = 0; i < t1->w; ++i) {
- int *data2 = data1 + i;
+ OPJ_INT32 *data2 = data1 + i;
opj_flag_t *flags2 = flags1 + i;
for (j = k; j < t1->h; ++j) {
flags2 += t1->flags_stride;
}
if (segsym) {
- int v = 0;
+ OPJ_INT32 v = 0;
opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
v = opj_mqc_decode(mqc);
v = (v << 1) | opj_mqc_decode(mqc);
const OPJ_FLOAT64 * mct_norms)
{
OPJ_FLOAT64 w1 = 1, w2, wmsedec;
+ OPJ_ARG_NOT_USED(numcomps);
if (mct_norms) {
w1 = mct_norms[compno];
return wmsedec;
}
-opj_bool opj_t1_allocate_buffers(
+OPJ_BOOL opj_t1_allocate_buffers(
opj_t1_t *t1,
OPJ_UINT32 w,
OPJ_UINT32 h)
opj_free(p_t1);
}
-opj_bool opj_t1_decode_cblks( opj_t1_t* t1,
+OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1,
opj_tcd_tilecomp_t* tilec,
opj_tccp_t* tccp
)
/*tiledp=(void*)&tilec->data[(y * tile_w) + x];*/
if (tccp->qmfbid == 1) {
- int* restrict tiledp = &tilec->data[(y * tile_w) + x];
+ OPJ_INT32* restrict tiledp = &tilec->data[(y * tile_w) + x];
for (j = 0; j < cblk_h; ++j) {
for (i = 0; i < cblk_w; ++i) {
OPJ_INT32 tmp = datap[(j * cblk_w) + i];
}
}
} else { /* if (tccp->qmfbid == 0) */
- float* restrict tiledp = (float*) &tilec->data[(y * tile_w) + x];
+ OPJ_FLOAT32* restrict tiledp = (OPJ_FLOAT32*) &tilec->data[(y * tile_w) + x];
for (j = 0; j < cblk_h; ++j) {
- float* restrict tiledp2 = tiledp;
+ OPJ_FLOAT32* restrict tiledp2 = tiledp;
for (i = 0; i < cblk_w; ++i) {
- float tmp = *datap * band->stepsize;
+ OPJ_FLOAT32 tmp = *datap * band->stepsize;
*tiledp2 = tmp;
datap++;
tiledp2++;
tiledp += tile_w;
}
}
- //opj_free(cblk->data);
- //opj_free(cblk->segs);
+ /*opj_free(cblk->data);
+ opj_free(cblk->segs);*/
/*cblk->segs = 00;*/
} /* cblkno */
- //opj_free(precinct->cblks.dec);
+ /*opj_free(precinct->cblks.dec);*/
} /* precno */
} /* bandno */
} /* resno */
}
-opj_bool opj_t1_decode_cblk(opj_t1_t *t1,
+OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 orient,
OPJ_UINT32 roishift,
}
for (passno = 0; passno < seg->real_num_passes; ++passno) {
-/* switch (passtype) {
- case 0:
- opj_t1_dec_sigpass(t1, bpno+1, orient, type, cblksty);
- break;
- case 1:
- opj_t1_dec_refpass(t1, bpno+1, type, cblksty);
- break;
- case 2:
- opj_t1_dec_clnpass(t1, bpno+1, orient, cblksty);
- break;
- }*/
switch (passtype) {
case 0:
if (type == T1_TYPE_RAW) {
-opj_bool opj_t1_encode_cblks( opj_t1_t *t1,
+OPJ_BOOL opj_t1_encode_cblks( opj_t1_t *t1,
opj_tcd_tile_t *tile,
opj_tcp_t *tcp,
const OPJ_FLOAT64 * mct_norms
pass->term = 1;
} else {
if (((bpno < ((OPJ_INT32) (cblk->numbps) - 4) && (passtype > 0))
- || ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
+ || ((bpno == ((OPJ_INT32)cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
if (type == T1_TYPE_RAW) {
opj_mqc_flush(mqc);
correction = 1;
}
}
-void opj_t1_dec_refpass(opj_t1_t *t1,
- OPJ_INT32 bpno,
- OPJ_BYTE type,
- OPJ_UINT32 cblksty)
-{
- OPJ_UINT32 i, j, k;
- OPJ_INT32 one, poshalf, neghalf;
- OPJ_UINT32 vsc;
- one = 1 << bpno;
- poshalf = one >> 1;
- neghalf = bpno > 0 ? -poshalf : -1;
- 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_dec_refpass_step(
- t1,
- &t1->flags[((j+1) * t1->flags_stride) + i + 1],
- &t1->data[(j * t1->w) + i],
- poshalf,
- neghalf,
- type,
- vsc);
- }
- }
- }
-} /* VSC and BYPASS by Antonin */
-
-
+#if 0
void opj_t1_dec_refpass_step( opj_t1_t *t1,
opj_flag_t *flagsp,
OPJ_INT32 *datap,
*flagsp |= T1_REFINE;
}
} /* VSC and BYPASS by Antonin */
+#endif
+
-void opj_t1_dec_sigpass(opj_t1_t *t1,
- OPJ_INT32 bpno,
- OPJ_UINT32 orient,
- OPJ_BYTE type,
- OPJ_UINT32 cblksty)
-{
- OPJ_UINT32 i, j, k, vsc;
- OPJ_INT32 one, half, oneplushalf;
- one = 1 << bpno;
- half = one >> 1;
- oneplushalf = one | half;
- 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_dec_sigpass_step(
- t1,
- &t1->flags[((j+1) * t1->flags_stride) + i + 1],
- &t1->data[(j * t1->w) + i],
- orient,
- oneplushalf,
- type,
- vsc);
- }
- }
- }
-} /* VSC and BYPASS by Antonin */
+#if 0
void opj_t1_dec_sigpass_step( opj_t1_t *t1,
opj_flag_t *flagsp,
OPJ_INT32 *datap,
*flagsp |= T1_VISIT;
}
} /* VSC and BYPASS by Antonin */
-
+#endif