diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-03-08 14:09:09 -0500 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-03-08 14:09:09 -0500 |
commit | 905197d750d00c460c4940c42c3b7b9c2f85441c (patch) | |
tree | a81fb46750b02635cad0c22bb429a6b41d294ed3 /silk/NSQ.c | |
parent | 59354a7742ff0fc182886f2f2567026e516c1eef (diff) | |
download | opus-905197d750d00c460c4940c42c3b7b9c2f85441c.tar.gz |
Fixes a bunch of 16-bit issues that the C5X compiler warns about
Diffstat (limited to 'silk/NSQ.c')
-rw-r--r-- | silk/NSQ.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -388,7 +388,7 @@ static inline void silk_nsq_scale_states( if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); } else { - gain_adj_Q16 = 1 << 16; + gain_adj_Q16 = (opus_int32)1 << 16; } /* Scale input */ @@ -413,7 +413,7 @@ static inline void silk_nsq_scale_states( } /* Adjust for changing gain */ - if( gain_adj_Q16 != 1 << 16 ) { + if( gain_adj_Q16 != (opus_int32)1 << 16 ) { /* Scale long-term shaping state */ for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i++ ) { NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] ); |