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/lpc.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/lpc.c')
| -rw-r--r-- | codecs/gsm/src/lpc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/codecs/gsm/src/lpc.c b/codecs/gsm/src/lpc.c index a8e9192ba..49145f86e 100644 --- a/codecs/gsm/src/lpc.c +++ b/codecs/gsm/src/lpc.c @@ -84,7 +84,7 @@ static void Autocorrelation P2((s, L_ACF), # else # define SCALE(n) \ case n: for (k = 0; k <= 159; k++) \ - s[k] = GSM_MULT_R( s[k], 16384 >> (n-1) );\ + s[k] = (word)GSM_MULT_R( s[k], 16384 >> (n-1) );\ break; # endif /* USE_FLOAT_MUL */ @@ -229,7 +229,7 @@ static void Reflection_coefficients P2( (L_ACF, r), assert(temp >= 0 && temp < 32); /* ? overflow ? */ - for (i = 0; i <= 8; i++) ACF[i] = SASR( L_ACF[i] << temp, 16 ); + for (i = 0; i <= 8; i++) ACF[i] = (word)SASR( L_ACF[i] << temp, 16 ); /* Initialize array P[..] and K[..] for the recursion. */ @@ -257,14 +257,14 @@ static void Reflection_coefficients P2( (L_ACF, r), /* Schur recursion */ - temp = GSM_MULT_R( P[1], *r ); + temp = (word)GSM_MULT_R( P[1], *r ); P[0] = GSM_ADD( P[0], temp ); for (m = 1; m <= 8 - n; m++) { - temp = GSM_MULT_R( K[ m ], *r ); + temp = (word)GSM_MULT_R( K[ m ], *r ); P[m] = GSM_ADD( P[ m+1 ], temp ); - temp = GSM_MULT_R( P[ m+1 ], *r ); + temp = (word)GSM_MULT_R( P[ m+1 ], *r ); K[m] = GSM_ADD( K[ m ], temp ); } } @@ -331,10 +331,10 @@ static void Quantization_and_coding P1((LAR), # undef STEP # define STEP( A, B, MAC, MIC ) \ - temp = GSM_MULT( A, *LAR ); \ + temp = (word)GSM_MULT( A, *LAR ); \ temp = GSM_ADD( temp, B ); \ temp = GSM_ADD( temp, 256 ); \ - temp = SASR( temp, 9 ); \ + temp = (word)SASR( temp, 9 ); \ *LAR = temp>MAC ? MAC - MIC : (temp<MIC ? 0 : temp - MIC); \ LAR++; |