diff options
author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 23:37:27 +0000 |
---|---|---|
committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 23:37:27 +0000 |
commit | 00dd1704f15d77f4b5ca3694493812b8e49a8696 (patch) | |
tree | 57c12cf4eda0931613bfedd345484014eeabeb2f /codecs/gsm/src/rpe.c | |
parent | 864716935ab085c63a1d6f1bef5beae1dbc76d97 (diff) |
Lots of little fixes for doing MSVC compiling codecs in windows (#6022)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9450 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/gsm/src/rpe.c')
-rw-r--r-- | codecs/gsm/src/rpe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codecs/gsm/src/rpe.c b/codecs/gsm/src/rpe.c index 8be0c0772..1c354795d 100644 --- a/codecs/gsm/src/rpe.c +++ b/codecs/gsm/src/rpe.c @@ -108,7 +108,7 @@ static void Weighting_filter P2((e, x), */ L_result = SASR( L_result, 13 ); - x[k] = ( L_result < MIN_WORD ? MIN_WORD + x[k] = (word)( L_result < MIN_WORD ? MIN_WORD : (L_result > MAX_WORD ? MAX_WORD : L_result )); } } @@ -334,7 +334,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out), assert(temp1 >= 0 && temp1 < 16); temp = xM[i] << temp1; - temp = GSM_MULT( temp, temp2 ); + temp = (word)GSM_MULT( temp, temp2 ); temp = SASR(temp, 12); xMc[i] = temp + 4; /* see note below */ } @@ -378,7 +378,7 @@ static void APCM_inverse_quantization P4((xMc,mant,exp,xMp), assert( temp <= 7 && temp >= -7 ); /* 4 bit signed */ temp <<= 12; /* 16 bit signed */ - temp = GSM_MULT_R( temp1, temp ); + temp = (word)GSM_MULT_R( temp1, temp ); temp = GSM_ADD( temp, temp3 ); *xMp++ = gsm_asr( temp, temp2 ); } |