From 56a91f139d6000c694c6de40a76dd8aa1a1eeb43 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 3 Aug 2016 14:36:23 -0700 Subject: [PATCH] Fix a number of msvc warnings Change-Id: Ic5ddba3ca0c87245617b6dbc78c0f13dc952ce8b --- vp10/common/vp10_fwd_txfm2d.c | 15 +++++---------- vp10/common/x86/vp10_fwd_txfm2d_sse4.c | 6 ++---- vp10/common/x86/vp10_inv_txfm_sse2.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/vp10/common/vp10_fwd_txfm2d.c b/vp10/common/vp10_fwd_txfm2d.c index cddd7dc65..e03e593b7 100644 --- a/vp10/common/vp10_fwd_txfm2d.c +++ b/vp10/common/vp10_fwd_txfm2d.c @@ -91,8 +91,7 @@ static INLINE void fwd_txfm2d_c(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[4 * 4]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_cfg(tx_type, TX_4X4); (void)bd; @@ -100,8 +99,7 @@ void vp10_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[8 * 8]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_cfg(tx_type, TX_8X8); (void)bd; @@ -109,8 +107,7 @@ void vp10_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[16 * 16]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_cfg(tx_type, TX_16X16); (void)bd; @@ -118,8 +115,7 @@ void vp10_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[32 * 32]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_cfg(tx_type, TX_32X32); (void)bd; @@ -127,8 +123,7 @@ void vp10_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[64 * 64]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_64x64_cfg(tx_type); (void)bd; diff --git a/vp10/common/x86/vp10_fwd_txfm2d_sse4.c b/vp10/common/x86/vp10_fwd_txfm2d_sse4.c index ff04dc891..eb9662eb8 100644 --- a/vp10/common/x86/vp10_fwd_txfm2d_sse4.c +++ b/vp10/common/x86/vp10_fwd_txfm2d_sse4.c @@ -90,8 +90,7 @@ static INLINE void fwd_txfm2d_sse4_1(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_32x32_sse4_1(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[1024]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_cfg(tx_type, TX_32X32); (void)bd; @@ -99,8 +98,7 @@ void vp10_fwd_txfm2d_32x32_sse4_1(const int16_t *input, int32_t *output, } void vp10_fwd_txfm2d_64x64_sse4_1(const int16_t *input, int32_t *output, - const int stride, int tx_type, - const int bd) { + int stride, int tx_type, int bd) { int32_t txfm_buf[4096]; TXFM_2D_FLIP_CFG cfg = vp10_get_fwd_txfm_64x64_cfg(tx_type); (void)bd; diff --git a/vp10/common/x86/vp10_inv_txfm_sse2.c b/vp10/common/x86/vp10_inv_txfm_sse2.c index b25e22e0e..0e9ee55a0 100644 --- a/vp10/common/x86/vp10_inv_txfm_sse2.c +++ b/vp10/common/x86/vp10_inv_txfm_sse2.c @@ -156,8 +156,8 @@ void vp10_idct4x4_1_add_sse2(const int16_t *input, uint8_t *dest, int stride) { const __m128i zero = _mm_setzero_si128(); int a; - a = dct_const_round_shift(input[0] * cospi_16_64); - a = dct_const_round_shift(a * cospi_16_64); + a = (int)dct_const_round_shift(input[0] * cospi_16_64); + a = (int)dct_const_round_shift(a * cospi_16_64); a = ROUND_POWER_OF_TWO(a, 4); dc_value = _mm_set1_epi16(a); @@ -523,8 +523,8 @@ void vp10_idct8x8_1_add_sse2(const int16_t *input, uint8_t *dest, int stride) { const __m128i zero = _mm_setzero_si128(); int a; - a = dct_const_round_shift(input[0] * cospi_16_64); - a = dct_const_round_shift(a * cospi_16_64); + a = (int)dct_const_round_shift(input[0] * cospi_16_64); + a = (int)dct_const_round_shift(a * cospi_16_64); a = ROUND_POWER_OF_TWO(a, 5); dc_value = _mm_set1_epi16(a); @@ -1301,8 +1301,8 @@ void vp10_idct16x16_1_add_sse2(const int16_t *input, const __m128i zero = _mm_setzero_si128(); int a, i; - a = dct_const_round_shift(input[0] * cospi_16_64); - a = dct_const_round_shift(a * cospi_16_64); + a = (int)dct_const_round_shift(input[0] * cospi_16_64); + a = (int)dct_const_round_shift(a * cospi_16_64); a = ROUND_POWER_OF_TWO(a, 6); dc_value = _mm_set1_epi16(a); @@ -3473,8 +3473,8 @@ void vp10_idct32x32_1_add_sse2(const int16_t *input, const __m128i zero = _mm_setzero_si128(); int a, i; - a = dct_const_round_shift(input[0] * cospi_16_64); - a = dct_const_round_shift(a * cospi_16_64); + a = (int)dct_const_round_shift(input[0] * cospi_16_64); + a = (int)dct_const_round_shift(a * cospi_16_64); a = ROUND_POWER_OF_TWO(a, 6); dc_value = _mm_set1_epi16(a); -- 2.49.0