From 62682ac8ad0681adcccd8b39aec260ca70174d37 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 25 Jul 2017 20:11:09 -0700 Subject: [PATCH] highbd_idct*_sse*.c: clear conversion warnings visual studio reports tran_high_t (int64) -> int in calls to _mm_setr_epi32 Change-Id: Ic2247c8e3800991202151790d78bd94c4f4aed05 --- vpx_dsp/x86/highbd_idct4x4_add_sse2.c | 15 ++++++++------ vpx_dsp/x86/highbd_idct4x4_add_sse4.c | 6 +++--- vpx_dsp/x86/highbd_idct8x8_add_sse4.c | 28 +++++++++++++-------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/vpx_dsp/x86/highbd_idct4x4_add_sse2.c b/vpx_dsp/x86/highbd_idct4x4_add_sse2.c index 9081741fd..505342b1c 100644 --- a/vpx_dsp/x86/highbd_idct4x4_add_sse2.c +++ b/vpx_dsp/x86/highbd_idct4x4_add_sse2.c @@ -22,9 +22,12 @@ static INLINE __m128i dct_const_round_shift_4_sse2(const __m128i in0, } static INLINE void highbd_idct4_small_sse2(__m128i *const io) { - const __m128i cospi_p16_p16 = _mm_setr_epi32(cospi_16_64, 0, cospi_16_64, 0); - const __m128i cospi_p08_p08 = _mm_setr_epi32(cospi_8_64, 0, cospi_8_64, 0); - const __m128i cospi_p24_p24 = _mm_setr_epi32(cospi_24_64, 0, cospi_24_64, 0); + const __m128i cospi_p16_p16 = + _mm_setr_epi32((int)cospi_16_64, 0, (int)cospi_16_64, 0); + const __m128i cospi_p08_p08 = + _mm_setr_epi32((int)cospi_8_64, 0, (int)cospi_8_64, 0); + const __m128i cospi_p24_p24 = + _mm_setr_epi32((int)cospi_24_64, 0, (int)cospi_24_64, 0); __m128i temp1[4], temp2[4], step[4]; transpose_32bit_4x4(io, io); @@ -91,11 +94,11 @@ static INLINE __m128i multiply_apply_sign_sse2(const __m128i in, static INLINE void highbd_idct4_large_sse2(__m128i *const io) { const __m128i cospi_p16_p16 = - _mm_setr_epi32(cospi_16_64 << 2, 0, cospi_16_64 << 2, 0); + _mm_setr_epi32((int)cospi_16_64 << 2, 0, (int)cospi_16_64 << 2, 0); const __m128i cospi_p08_p08 = - _mm_setr_epi32(cospi_8_64 << 2, 0, cospi_8_64 << 2, 0); + _mm_setr_epi32((int)cospi_8_64 << 2, 0, (int)cospi_8_64 << 2, 0); const __m128i cospi_p24_p24 = - _mm_setr_epi32(cospi_24_64 << 2, 0, cospi_24_64 << 2, 0); + _mm_setr_epi32((int)cospi_24_64 << 2, 0, (int)cospi_24_64 << 2, 0); __m128i temp1[4], temp2[4], step[4], sign1[4], sign2[4]; transpose_32bit_4x4(io, io); diff --git a/vpx_dsp/x86/highbd_idct4x4_add_sse4.c b/vpx_dsp/x86/highbd_idct4x4_add_sse4.c index a9086ee29..cc20df03c 100644 --- a/vpx_dsp/x86/highbd_idct4x4_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct4x4_add_sse4.c @@ -18,11 +18,11 @@ static INLINE void highbd_idct4(__m128i *const io) { const __m128i cospi_p16_p16 = - _mm_setr_epi32(cospi_16_64 << 2, 0, cospi_16_64 << 2, 0); + _mm_setr_epi32((int)cospi_16_64 << 2, 0, (int)cospi_16_64 << 2, 0); const __m128i cospi_p08_p08 = - _mm_setr_epi32(cospi_8_64 << 2, 0, cospi_8_64 << 2, 0); + _mm_setr_epi32((int)cospi_8_64 << 2, 0, (int)cospi_8_64 << 2, 0); const __m128i cospi_p24_p24 = - _mm_setr_epi32(cospi_24_64 << 2, 0, cospi_24_64 << 2, 0); + _mm_setr_epi32((int)cospi_24_64 << 2, 0, (int)cospi_24_64 << 2, 0); __m128i temp1[4], step[4]; transpose_32bit_4x4(io, io); diff --git a/vpx_dsp/x86/highbd_idct8x8_add_sse4.c b/vpx_dsp/x86/highbd_idct8x8_add_sse4.c index 4132495c3..4513c0fb5 100644 --- a/vpx_dsp/x86/highbd_idct8x8_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct8x8_add_sse4.c @@ -19,19 +19,19 @@ static void highbd_idct8x8_half1d(__m128i *const io) { const __m128i cp_4q_4q = - _mm_setr_epi32(cospi_4_64 << 2, 0, cospi_4_64 << 2, 0); + _mm_setr_epi32((int)cospi_4_64 << 2, 0, (int)cospi_4_64 << 2, 0); const __m128i cp_8q_8q = - _mm_setr_epi32(cospi_8_64 << 2, 0, cospi_8_64 << 2, 0); + _mm_setr_epi32((int)cospi_8_64 << 2, 0, (int)cospi_8_64 << 2, 0); const __m128i cp_12q_12q = - _mm_setr_epi32(cospi_12_64 << 2, 0, cospi_12_64 << 2, 0); + _mm_setr_epi32((int)cospi_12_64 << 2, 0, (int)cospi_12_64 << 2, 0); const __m128i cp_16q_16q = - _mm_setr_epi32(cospi_16_64 << 2, 0, cospi_16_64 << 2, 0); + _mm_setr_epi32((int)cospi_16_64 << 2, 0, (int)cospi_16_64 << 2, 0); const __m128i cp_20q_20q = - _mm_setr_epi32(cospi_20_64 << 2, 0, cospi_20_64 << 2, 0); + _mm_setr_epi32((int)cospi_20_64 << 2, 0, (int)cospi_20_64 << 2, 0); const __m128i cp_24q_24q = - _mm_setr_epi32(cospi_24_64 << 2, 0, cospi_24_64 << 2, 0); + _mm_setr_epi32((int)cospi_24_64 << 2, 0, (int)cospi_24_64 << 2, 0); const __m128i cp_28q_28q = - _mm_setr_epi32(cospi_28_64 << 2, 0, cospi_28_64 << 2, 0); + _mm_setr_epi32((int)cospi_28_64 << 2, 0, (int)cospi_28_64 << 2, 0); __m128i temp1[4], temp2[4], step1[8], step2[8]; transpose_32bit_4x4x2(io, io); @@ -87,19 +87,19 @@ static void highbd_idct8x8_half1d(__m128i *const io) { static void highbd_idct8x8_12_half1d(__m128i *const io) { const __m128i cp_28q_28q = - _mm_setr_epi32(cospi_28_64 << 2, 0, cospi_28_64 << 2, 0); + _mm_setr_epi32((int)cospi_28_64 << 2, 0, (int)cospi_28_64 << 2, 0); const __m128i cp_4q_4q = - _mm_setr_epi32(cospi_4_64 << 2, 0, cospi_4_64 << 2, 0); + _mm_setr_epi32((int)cospi_4_64 << 2, 0, (int)cospi_4_64 << 2, 0); const __m128i cp_n20q_n20q = - _mm_setr_epi32(-cospi_20_64 * 4, 0, -cospi_20_64 * 4, 0); + _mm_setr_epi32(-(int)cospi_20_64 * 4, 0, -(int)cospi_20_64 * 4, 0); const __m128i cp_12q_12q = - _mm_setr_epi32(cospi_12_64 << 2, 0, cospi_12_64 << 2, 0); + _mm_setr_epi32((int)cospi_12_64 << 2, 0, (int)cospi_12_64 << 2, 0); const __m128i cp_16q_16q = - _mm_setr_epi32(cospi_16_64 << 2, 0, cospi_16_64 << 2, 0); + _mm_setr_epi32((int)cospi_16_64 << 2, 0, (int)cospi_16_64 << 2, 0); const __m128i cp_8q_8q = - _mm_setr_epi32(cospi_8_64 << 2, 0, cospi_8_64 << 2, 0); + _mm_setr_epi32((int)cospi_8_64 << 2, 0, (int)cospi_8_64 << 2, 0); const __m128i cp_24q_24q = - _mm_setr_epi32(cospi_24_64 << 2, 0, cospi_24_64 << 2, 0); + _mm_setr_epi32((int)cospi_24_64 << 2, 0, (int)cospi_24_64 << 2, 0); __m128i temp1[4], temp2[4], step1[8], step2[8]; transpose_32bit_4x4(io, io);