walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

optimization of dwt_deinterleave_h, dwt_deinterleave_v from v2 branch; update type with OPJ_type

This commit is contained in:
Mickael Savinaud 2012-08-16 15:33:33 +00:00
parent d1251b2850
commit 8b7107b81f
1 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
libopenjpeg/dwt.c
View File

@ -86,23 +86,23 @@ typedef void (*DWT1DFN)(dwt_t* v);
/** /**
Forward lazy transform (horizontal) Forward lazy transform (horizontal)
*/ */
static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas); static void opj_dwt_deinterleave_h(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas);
/** /**
Forward lazy transform (vertical) Forward lazy transform (vertical)
*/ */
static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas); static void dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas);
/** /**
Inverse lazy transform (horizontal) Inverse lazy transform (horizontal)
*/ */
static void dwt_interleave_h(dwt_t* h, int *a); static void dwt_interleave_h(dwt_t* h, OPJ_INT32 *a);
/** /**
Inverse lazy transform (vertical) Inverse lazy transform (vertical)
*/ */
static void dwt_interleave_v(dwt_t* v, int *a, int x); static void dwt_interleave_v(dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x);
/** /**
Forward 5-3 wavelet transform in 1-D Forward 5-3 wavelet transform in 1-D
*/ */
static void dwt_encode_1(int *a, int dn, int sn, int cas); static void dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas);
/** /**
Inverse 5-3 wavelet transform in 1-D Inverse 5-3 wavelet transform in 1-D
*/ */
@ -110,17 +110,14 @@ static void dwt_decode_1(dwt_t *v);
/** /**
Forward 9-7 wavelet transform in 1-D Forward 9-7 wavelet transform in 1-D
*/ */
static void dwt_encode_1_real(int *a, int dn, int sn, int cas); static void dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas);
/** /**
Explicit calculation of the Quantization Stepsizes Explicit calculation of the Quantization Stepsizes
*/ */
static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize); static void dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps, opj_stepsize_t *bandno_stepsize);
/** /**
Inverse wavelet transform in 2-D. Inverse wavelet transform in 2-D (remark: in V1 i parameter was a int)
*/ */
#ifdef OPJ_V1
static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int i, DWT1DFN fn);
#endif
static opj_bool dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i, DWT1DFN fn); static opj_bool dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i, DWT1DFN fn);
/** /**
@ -175,28 +172,57 @@ static const double dwt_norms_real[4][10] = {
/* <summary> */ /* <summary> */
/* Forward lazy transform (horizontal). */ /* Forward lazy transform (horizontal). */
/* </summary> */ /* </summary> */
static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas) { void opj_dwt_deinterleave_h(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
int i; OPJ_INT32 i;
for (i=0; i<sn; i++) b[i]=a[2*i+cas]; OPJ_INT32 * l_dest = b;
for (i=0; i<dn; i++) b[sn+i]=a[(2*i+1-cas)]; OPJ_INT32 * l_src = a+cas;
for (i=0; i<sn; ++i) {
*l_dest++ = *l_src;
l_src += 2;
}
l_dest = b + sn;
l_src = a + 1 - cas;
for (i=0; i<dn; ++i) {
*l_dest++=*l_src;
l_src += 2;
}
} }
/* <summary> */ /* <summary> */
/* Forward lazy transform (vertical). */ /* Forward lazy transform (vertical). */
/* </summary> */ /* </summary> */
static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) { void dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas) {
int i; OPJ_INT32 i = sn;
for (i=0; i<sn; i++) b[i*x]=a[2*i+cas]; OPJ_INT32 * l_dest = b;
for (i=0; i<dn; i++) b[(sn+i)*x]=a[(2*i+1-cas)]; OPJ_INT32 * l_src = a+cas;
while (i--) {
*l_dest = *l_src;
l_dest += x;
l_src += 2;
} /* b[i*x]=a[2*i+cas]; */
l_dest = b + sn * x;
l_src = a + 1 - cas;
i = dn;
while (i--) {
*l_dest = *l_src;
l_dest += x;
l_src += 2;
} /*b[(sn+i)*x]=a[(2*i+1-cas)];*/
} }
/* <summary> */ /* <summary> */
/* Inverse lazy transform (horizontal). */ /* Inverse lazy transform (horizontal). */
/* </summary> */ /* </summary> */
static void dwt_interleave_h(dwt_t* h, int *a) { void dwt_interleave_h(dwt_t* h, OPJ_INT32 *a) {
int *ai = a; OPJ_INT32 *ai = a;
int *bi = h->mem + h->cas; OPJ_INT32 *bi = h->mem + h->cas;
int i = h->sn; OPJ_INT32 i = h->sn;
while( i-- ) { while( i-- ) {
*bi = *(ai++); *bi = *(ai++);
bi += 2; bi += 2;
@ -213,10 +239,10 @@ static void dwt_interleave_h(dwt_t* h, int *a) {
/* <summary> */ /* <summary> */
/* Inverse lazy transform (vertical). */ /* Inverse lazy transform (vertical). */
/* </summary> */ /* </summary> */
static void dwt_interleave_v(dwt_t* v, int *a, int x) { void dwt_interleave_v(dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x) {
int *ai = a; OPJ_INT32 *ai = a;
int *bi = v->mem + v->cas; OPJ_INT32 *bi = v->mem + v->cas;
int i = v->sn; OPJ_INT32 i = v->sn;
while( i-- ) { while( i-- ) {
*bi = *ai; *bi = *ai;
bi += 2; bi += 2;
@ -236,8 +262,8 @@ static void dwt_interleave_v(dwt_t* v, int *a, int x) {
/* <summary> */ /* <summary> */
/* Forward 5-3 wavelet transform in 1-D. */ /* Forward 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
static void dwt_encode_1(int *a, int dn, int sn, int cas) { void dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
int i; OPJ_INT32 i;
if (!cas) { if (!cas) {
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */ if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
@ -257,8 +283,8 @@ static void dwt_encode_1(int *a, int dn, int sn, int cas) {
/* <summary> */ /* <summary> */
/* Inverse 5-3 wavelet transform in 1-D. */ /* Inverse 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
static void dwt_decode_1_(int *a, int dn, int sn, int cas) { static void dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
int i; OPJ_INT32 i;
if (!cas) { if (!cas) {
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */ if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
@ -285,8 +311,8 @@ static void dwt_decode_1(dwt_t *v) {
/* <summary> */ /* <summary> */
/* Forward 9-7 wavelet transform in 1-D. */ /* Forward 9-7 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
static void dwt_encode_1_real(int *a, int dn, int sn, int cas) { static void dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
int i; OPJ_INT32 i;
if (!cas) { if (!cas) {
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */ if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
for (i = 0; i < dn; i++) for (i = 0; i < dn; i++)
@ -320,8 +346,8 @@ static void dwt_encode_1_real(int *a, int dn, int sn, int cas) {
} }
} }
static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize) { static void dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps, opj_stepsize_t *bandno_stepsize) {
int p, n; OPJ_INT32 p, n;
p = int_floorlog2(stepsize) - 13; p = int_floorlog2(stepsize) - 13;
n = 11 - int_floorlog2(stepsize); n = 11 - int_floorlog2(stepsize);
bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff; bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
@ -383,7 +409,7 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec) {
aj = a + j * w; aj = a + j * w;
for (k = 0; k < rw; k++) bj[k] = aj[k]; for (k = 0; k < rw; k++) bj[k] = aj[k];
dwt_encode_1(bj, dn, sn, cas_row); dwt_encode_1(bj, dn, sn, cas_row);
dwt_deinterleave_h(bj, aj, dn, sn, cas_row); opj_dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
} }
opj_free(bj); opj_free(bj);
} }
@ -459,7 +485,7 @@ INLINE opj_bool dwt_encode_procedure(opj_tcd_tilecomp_v2_t * tilec,void (*p_func
aj = a + j * w; aj = a + j * w;
for (k = 0; k < rw; k++) bj[k] = aj[k]; for (k = 0; k < rw; k++) bj[k] = aj[k];
(*p_function) (bj, dn, sn, cas_row); (*p_function) (bj, dn, sn, cas_row);
dwt_deinterleave_h(bj, aj, dn, sn, cas_row); opj_dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
} }
l_cur_res = l_last_res; l_cur_res = l_last_res;
@ -581,7 +607,7 @@ void dwt_encode_real(opj_tcd_tilecomp_t * tilec) {
aj = a + j * w; aj = a + j * w;
for (k = 0; k < rw; k++) bj[k] = aj[k]; for (k = 0; k < rw; k++) bj[k] = aj[k];
dwt_encode_1_real(bj, dn, sn, cas_row); dwt_encode_1_real(bj, dn, sn, cas_row);
dwt_deinterleave_h(bj, aj, dn, sn, cas_row); opj_dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
} }
opj_free(bj); opj_free(bj);
} }