diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
| commit | b20356ecb30f87a4b7aca162dac946c9710e23f3 (patch) | |
| tree | ee64bc0c440a820e1475ddce5de0e099f0dc6847 /third_party/g7221/encode | |
| parent | fb257e0aaa5b9b078b57c252acdf69c1ba793513 (diff) | |
Ticket #774:
- Added build config for GNU autoconf & make.
- Fixed some G.722.1 codes for linux & mingw32 targets, e.g: types
defs, collision function name 'round'.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2601 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/g7221/encode')
| -rw-r--r-- | third_party/g7221/encode/dct4_a.c | 10 | ||||
| -rw-r--r-- | third_party/g7221/encode/sam2coef.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/third_party/g7221/encode/dct4_a.c b/third_party/g7221/encode/dct4_a.c index 24f4f5e0..4d7c7650 100644 --- a/third_party/g7221/encode/dct4_a.c +++ b/third_party/g7221/encode/dct4_a.c @@ -225,7 +225,7 @@ void dct_type_iv_a (Word16 *input,Word16 *output,Word16 dct_length) { sum = L_mac(sum, pair_ptr[i],dct_core_a[i][k]); } - buffer_swap[k] = round(sum); + buffer_swap[k] = itu_round(sum); } /* address arithmetic */ pair_ptr += CORE_SIZE; @@ -312,23 +312,23 @@ void dct_type_iv_a (Word16 *input,Word16 *output,Word16 dct_length) sum=L_mac(sum,cos_even,in_low_even); neg_msin_even = negate(msin_even); sum=L_mac(sum,neg_msin_even,in_high_even); - out_low_even = round(sum); + out_low_even = itu_round(sum); sum = 0L; sum=L_mac(sum,msin_even,in_low_even); sum=L_mac(sum,cos_even,in_high_even); - out_high_even= round(sum); + out_high_even= itu_round(sum); sum = 0L; sum=L_mac(sum,cos_odd,in_low_odd); sum=L_mac(sum,msin_odd,in_high_odd); - out_low_odd= round(sum); + out_low_odd= itu_round(sum); sum = 0L; sum=L_mac(sum,msin_odd,in_low_odd); neg_cos_odd = negate(cos_odd); sum=L_mac(sum,neg_cos_odd,in_high_odd); - out_high_odd= round(sum); + out_high_odd= itu_round(sum); *out_ptr_low++ = out_low_even; *--out_ptr_high = out_high_even; diff --git a/third_party/g7221/encode/sam2coef.c b/third_party/g7221/encode/sam2coef.c index 08ee0e11..57c8fce8 100644 --- a/third_party/g7221/encode/sam2coef.c +++ b/third_party/g7221/encode/sam2coef.c @@ -120,7 +120,7 @@ Word16 samples_to_rmlt_coefs(Word16 *new_samples,Word16 *old_samples,Word16 *coe acca = L_mac(acca,*--win_low, *--sam_low); acca = L_mac(acca,*win_high++, *sam_high++); - temp = round(acca); + temp = itu_round(acca); *dst_ptr++ = temp; move16(); @@ -145,7 +145,7 @@ Word16 samples_to_rmlt_coefs(Word16 *new_samples,Word16 *old_samples,Word16 *coe neg_win_low = negate(*win_low++); samp_high = *--sam_high; acca = L_mac(acca, neg_win_low, samp_high); - temp = round(acca); + temp = itu_round(acca); *dst_ptr++=temp; move16(); |