1*3ac0a46fSAndroid Build Coastguard Workerdiff --git a/third_party/libopenjpeg/mct.c b/third_party/libopenjpeg/mct.c 2*3ac0a46fSAndroid Build Coastguard Workerindex 88c8f4092..c4c2e732e 100644 3*3ac0a46fSAndroid Build Coastguard Worker--- a/third_party/libopenjpeg/mct.c 4*3ac0a46fSAndroid Build Coastguard Worker+++ b/third_party/libopenjpeg/mct.c 5*3ac0a46fSAndroid Build Coastguard Worker@@ -37,13 +37,15 @@ 6*3ac0a46fSAndroid Build Coastguard Worker * POSSIBILITY OF SUCH DAMAGE. 7*3ac0a46fSAndroid Build Coastguard Worker */ 8*3ac0a46fSAndroid Build Coastguard Worker 9*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE__ 10*3ac0a46fSAndroid Build Coastguard Worker+#if defined(__SSE__) && !defined(_M_IX86) && !defined(__i386) 11*3ac0a46fSAndroid Build Coastguard Worker+#define USE_SSE 12*3ac0a46fSAndroid Build Coastguard Worker #include <xmmintrin.h> 13*3ac0a46fSAndroid Build Coastguard Worker #endif 14*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE2__ 15*3ac0a46fSAndroid Build Coastguard Worker+#if defined(__SSE2__) && !defined(_M_IX86) && !defined(__i386) 16*3ac0a46fSAndroid Build Coastguard Worker+#define USE_SSE2 17*3ac0a46fSAndroid Build Coastguard Worker #include <emmintrin.h> 18*3ac0a46fSAndroid Build Coastguard Worker #endif 19*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE4_1__ 20*3ac0a46fSAndroid Build Coastguard Worker+#if defined(__SSE4_1__) && !defined(_M_IX86) && !defined(__i386) 21*3ac0a46fSAndroid Build Coastguard Worker #include <smmintrin.h> 22*3ac0a46fSAndroid Build Coastguard Worker #endif 23*3ac0a46fSAndroid Build Coastguard Worker 24*3ac0a46fSAndroid Build Coastguard Worker@@ -72,7 +74,7 @@ const OPJ_FLOAT64 * opj_mct_get_mct_norms_real() 25*3ac0a46fSAndroid Build Coastguard Worker /* <summary> */ 26*3ac0a46fSAndroid Build Coastguard Worker /* Forward reversible MCT. */ 27*3ac0a46fSAndroid Build Coastguard Worker /* </summary> */ 28*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE2__ 29*3ac0a46fSAndroid Build Coastguard Worker+#ifdef USE_SSE2 30*3ac0a46fSAndroid Build Coastguard Worker void opj_mct_encode( 31*3ac0a46fSAndroid Build Coastguard Worker OPJ_INT32* OPJ_RESTRICT c0, 32*3ac0a46fSAndroid Build Coastguard Worker OPJ_INT32* OPJ_RESTRICT c1, 33*3ac0a46fSAndroid Build Coastguard Worker@@ -141,7 +143,7 @@ void opj_mct_encode( 34*3ac0a46fSAndroid Build Coastguard Worker /* <summary> */ 35*3ac0a46fSAndroid Build Coastguard Worker /* Inverse reversible MCT. */ 36*3ac0a46fSAndroid Build Coastguard Worker /* </summary> */ 37*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE2__ 38*3ac0a46fSAndroid Build Coastguard Worker+#ifdef USE_SSE2 39*3ac0a46fSAndroid Build Coastguard Worker void opj_mct_decode( 40*3ac0a46fSAndroid Build Coastguard Worker OPJ_INT32* OPJ_RESTRICT c0, 41*3ac0a46fSAndroid Build Coastguard Worker OPJ_INT32* OPJ_RESTRICT c1, 42*3ac0a46fSAndroid Build Coastguard Worker@@ -216,7 +218,7 @@ void opj_mct_encode_real( 43*3ac0a46fSAndroid Build Coastguard Worker OPJ_SIZE_T n) 44*3ac0a46fSAndroid Build Coastguard Worker { 45*3ac0a46fSAndroid Build Coastguard Worker OPJ_SIZE_T i; 46*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE__ 47*3ac0a46fSAndroid Build Coastguard Worker+#ifdef USE_SSE 48*3ac0a46fSAndroid Build Coastguard Worker const __m128 YR = _mm_set1_ps(0.299f); 49*3ac0a46fSAndroid Build Coastguard Worker const __m128 YG = _mm_set1_ps(0.587f); 50*3ac0a46fSAndroid Build Coastguard Worker const __m128 YB = _mm_set1_ps(0.114f); 51*3ac0a46fSAndroid Build Coastguard Worker@@ -286,7 +288,7 @@ void opj_mct_decode_real( 52*3ac0a46fSAndroid Build Coastguard Worker OPJ_SIZE_T n) 53*3ac0a46fSAndroid Build Coastguard Worker { 54*3ac0a46fSAndroid Build Coastguard Worker OPJ_SIZE_T i; 55*3ac0a46fSAndroid Build Coastguard Worker-#ifdef __SSE__ 56*3ac0a46fSAndroid Build Coastguard Worker+#ifdef USE_SSE 57*3ac0a46fSAndroid Build Coastguard Worker __m128 vrv, vgu, vgv, vbu; 58*3ac0a46fSAndroid Build Coastguard Worker vrv = _mm_set1_ps(1.402f); 59*3ac0a46fSAndroid Build Coastguard Worker vgu = _mm_set1_ps(0.34413f); 60