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

dwt.c: change sign of constants to match standard and compensate (no functional change)

This commit is contained in:
Even Rouault 2020-05-18 18:09:10 +02:00
parent 07d1f775a1
commit 99107d5e46
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/openjp2/dwt.c
View File

@ -102,10 +102,11 @@ typedef struct v4dwt_local {
OPJ_UINT32 win_h_x1; /* end coord in high pass band */ OPJ_UINT32 win_h_x1; /* end coord in high pass band */
} opj_v4dwt_t ; } opj_v4dwt_t ;
static const OPJ_FLOAT32 opj_dwt_alpha = 1.586134342f; /* 12994 */ /* From table F.4 from the standard */
static const OPJ_FLOAT32 opj_dwt_beta = 0.052980118f; /* 434 */ static const OPJ_FLOAT32 opj_dwt_alpha = -1.586134342f; /* 12994 */
static const OPJ_FLOAT32 opj_dwt_gamma = -0.882911075f; /* -7233 */ static const OPJ_FLOAT32 opj_dwt_beta = -0.052980118f; /* 434 */
static const OPJ_FLOAT32 opj_dwt_delta = -0.443506852f; /* -3633 */ static const OPJ_FLOAT32 opj_dwt_gamma = 0.882911075f; /* -7233 */
static const OPJ_FLOAT32 opj_dwt_delta = 0.443506852f; /* -3633 */
static const OPJ_FLOAT32 opj_K = 1.230174105f; /* 10078 */ static const OPJ_FLOAT32 opj_K = 1.230174105f; /* 10078 */
static const OPJ_FLOAT32 opj_c13318 = 1.625732422f; static const OPJ_FLOAT32 opj_c13318 = 1.625732422f;
@ -2627,19 +2628,19 @@ static void opj_v4dwt_decode(opj_v4dwt_t* OPJ_RESTRICT dwt)
opj_v4dwt_decode_step2_sse(dwt->wavelet + b, dwt->wavelet + a + 1, opj_v4dwt_decode_step2_sse(dwt->wavelet + b, dwt->wavelet + a + 1,
dwt->win_l_x0, dwt->win_l_x1, dwt->win_l_x0, dwt->win_l_x1,
(OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a), (OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a),
_mm_set1_ps(opj_dwt_delta)); _mm_set1_ps(-opj_dwt_delta));
opj_v4dwt_decode_step2_sse(dwt->wavelet + a, dwt->wavelet + b + 1, opj_v4dwt_decode_step2_sse(dwt->wavelet + a, dwt->wavelet + b + 1,
dwt->win_h_x0, dwt->win_h_x1, dwt->win_h_x0, dwt->win_h_x1,
(OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b), (OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b),
_mm_set1_ps(opj_dwt_gamma)); _mm_set1_ps(-opj_dwt_gamma));
opj_v4dwt_decode_step2_sse(dwt->wavelet + b, dwt->wavelet + a + 1, opj_v4dwt_decode_step2_sse(dwt->wavelet + b, dwt->wavelet + a + 1,
dwt->win_l_x0, dwt->win_l_x1, dwt->win_l_x0, dwt->win_l_x1,
(OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a), (OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a),
_mm_set1_ps(opj_dwt_beta)); _mm_set1_ps(-opj_dwt_beta));
opj_v4dwt_decode_step2_sse(dwt->wavelet + a, dwt->wavelet + b + 1, opj_v4dwt_decode_step2_sse(dwt->wavelet + a, dwt->wavelet + b + 1,
dwt->win_h_x0, dwt->win_h_x1, dwt->win_h_x0, dwt->win_h_x1,
(OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b), (OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b),
_mm_set1_ps(opj_dwt_alpha)); _mm_set1_ps(-opj_dwt_alpha));
#else #else
opj_v4dwt_decode_step1(dwt->wavelet + a, dwt->win_l_x0, dwt->win_l_x1, opj_v4dwt_decode_step1(dwt->wavelet + a, dwt->win_l_x0, dwt->win_l_x1,
opj_K); opj_K);
@ -2648,19 +2649,19 @@ static void opj_v4dwt_decode(opj_v4dwt_t* OPJ_RESTRICT dwt)
opj_v4dwt_decode_step2(dwt->wavelet + b, dwt->wavelet + a + 1, opj_v4dwt_decode_step2(dwt->wavelet + b, dwt->wavelet + a + 1,
dwt->win_l_x0, dwt->win_l_x1, dwt->win_l_x0, dwt->win_l_x1,
(OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a), (OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a),
opj_dwt_delta); -opj_dwt_delta);
opj_v4dwt_decode_step2(dwt->wavelet + a, dwt->wavelet + b + 1, opj_v4dwt_decode_step2(dwt->wavelet + a, dwt->wavelet + b + 1,
dwt->win_h_x0, dwt->win_h_x1, dwt->win_h_x0, dwt->win_h_x1,
(OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b), (OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b),
opj_dwt_gamma); -opj_dwt_gamma);
opj_v4dwt_decode_step2(dwt->wavelet + b, dwt->wavelet + a + 1, opj_v4dwt_decode_step2(dwt->wavelet + b, dwt->wavelet + a + 1,
dwt->win_l_x0, dwt->win_l_x1, dwt->win_l_x0, dwt->win_l_x1,
(OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a), (OPJ_UINT32)opj_int_min(dwt->sn, dwt->dn - a),
opj_dwt_beta); -opj_dwt_beta);
opj_v4dwt_decode_step2(dwt->wavelet + a, dwt->wavelet + b + 1, opj_v4dwt_decode_step2(dwt->wavelet + a, dwt->wavelet + b + 1,
dwt->win_h_x0, dwt->win_h_x1, dwt->win_h_x0, dwt->win_h_x1,
(OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b), (OPJ_UINT32)opj_int_min(dwt->dn, dwt->sn - b),
opj_dwt_alpha); -opj_dwt_alpha);
#endif #endif
} }