| Index: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c
|
| diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c
|
| index 5f710e87b284660457b87d6d2a4a488a7533aa07..60698e3ffe8d32ff5bb3c46a5d026d89b4928f74 100644
|
| --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c
|
| +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c
|
| @@ -140,9 +140,7 @@ static void opj_v4dwt_interleave_h(opj_v4dwt_t* restrict w, OPJ_FLOAT32* restric
|
|
|
| static void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a , OPJ_INT32 x, OPJ_INT32 nb_elts_read);
|
|
|
| -//#ifdef __SSE__
|
| -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager
|
| -#if 0
|
| +#ifdef __SSE__
|
| static void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c);
|
|
|
| static void opj_v4dwt_decode_step2_sse(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, __m128 c);
|
| @@ -673,9 +671,8 @@ void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a ,
|
| }
|
| }
|
|
|
| -//#ifdef __SSE__
|
| -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager
|
| -#if 0
|
| +#ifdef __SSE__
|
| +
|
| void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c){
|
| __m128* restrict vw = (__m128*) w;
|
| OPJ_INT32 i;
|
| @@ -812,9 +809,7 @@ void opj_v4dwt_decode(opj_v4dwt_t* restrict dwt)
|
| b = 0;
|
| }
|
|
|
| -//#ifdef __SSE__
|
| -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager
|
| -#if 0
|
| +#ifdef __SSE__
|
| opj_v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(opj_K));
|
| opj_v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(opj_c13318));
|
| opj_v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, opj_int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(opj_dwt_delta));
|
|
|