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/short_term.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/short_term.c')
| -rw-r--r-- | codecs/gsm/src/short_term.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/codecs/gsm/src/short_term.c b/codecs/gsm/src/short_term.c index c8c0c1b2b..43c592c04 100644 --- a/codecs/gsm/src/short_term.c +++ b/codecs/gsm/src/short_term.c @@ -58,7 +58,7 @@ static void Decoding_of_the_coded_Log_Area_Ratios P2((LARc,LARpp), #define STEP( B, MIC, INVA ) \ temp1 = GSM_ADD( *LARc++, MIC ) << 10; \ temp1 = GSM_SUB( temp1, B << 1 ); \ - temp1 = GSM_MULT_R( INVA, temp1 ); \ + temp1 = (word)GSM_MULT_R( INVA, temp1 ); \ *LARpp++ = GSM_ADD( temp1, temp1 ); STEP( 0, -32, 13107 ); @@ -214,7 +214,7 @@ static void Short_term_analysis_filtering P4((u0,rp0,k_n,s), for (rp=rp0, u=u0; u<u_top;) { register longword ui, rpi; ui = *u; - *u++ = u_out; + *u++ = (word)u_out; rpi = *rp++; u_out = ui + (((rpi*di)+0x4000)>>15); di = di + (((rpi*ui)+0x4000)>>15); @@ -226,7 +226,7 @@ static void Short_term_analysis_filtering P4((u0,rp0,k_n,s), if (di>MAX_WORD) di=MAX_WORD; else if (di<MIN_WORD) di=MIN_WORD; } - *s++ = di; + *s++ = (word)di; } } #endif @@ -315,9 +315,9 @@ static void Short_term_synthesis_filtering P5((S,rrp,k,wt,sr), if (tmp1 != (word)tmp1) { tmp1 = (tmp1<0)? MIN_WORD:MAX_WORD; } - v[i+1] = tmp1; + v[i+1] = (word)tmp1; } - *sr++ = v[0] = sri; + *sr++ = v[0] = (word)sri; } } @@ -373,7 +373,7 @@ void Gsm_Short_Term_Analysis_Filter P3((S,LARc,s), word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; word LARp[8]; -int i; + #undef FILTER #if defined(FAST) && defined(USE_FLOAT_MUL) # define FILTER (* (S->fast \ |