webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c - Issue 1168753002: Match existing type usage better.

Unified Diff: webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

Issue 1168753002: Match existing type usage better. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Attempted test fix Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/modules/audio_coding/codecs/cng/webrtc_cng.c ('K') | « webrtc/modules/audio_coding/codecs/ilbc/encode.c ('k') | webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c » ('j') | webrtc/modules/audio_coding/codecs/isac/fix/test/kenny.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

index fde541455c66654bd0d24a7954f3999d1e87b1a6..5c1d604e21b2d704773b1a3e8a9d5a35211f4a7b 100644

--- a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

+++ b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

@@ -98,9 +98,9 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */

k=WebRtcSpl_DownsampleFast(

enh_buf+ENH_BUFL-inLen, /* Input samples */

- (int16_t)(inLen+ENH_BUFL_FILTEROVERHEAD),

+ inLen + ENH_BUFL_FILTEROVERHEAD,

downsampled,

- (int16_t)(inLen / 2),

+ inLen / 2,

(int16_t*)WebRtcIlbcfix_kLpFiltCoefs, /* Coefficients in Q12 */

FILTERORDER_DS_PLUS1, /* Length of filter (order-1) */

FACTOR_DS,

@@ -115,8 +115,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */

regressor=downsampled+i-10;

/* scaling */

- max16=WebRtcSpl_MaxAbsValueW16(&regressor[-50],

- (int16_t)(ENH_BLOCKL_HALF+50-1));

+ max16=WebRtcSpl_MaxAbsValueW16(&regressor[-50], ENH_BLOCKL_HALF + 50 - 1);

kwiberg-webrtc 2015/06/08 13:09:38 Optional: fix formatting on the whole line while y

Peter Kasting 2015/06/08 20:44:29 I can do that for all three places in this file.

Peter Kasting 2015/06/10 01:09:54 Done.

shifts = WebRtcSpl_GetSizeInBits((uint32_t)(max16 * max16)) - 25;

shifts = WEBRTC_SPL_MAX(0, shifts);

@@ -200,7 +199,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */

regressor=in+tlag-1;

/* scaling */

- max16=WebRtcSpl_MaxAbsValueW16(regressor, (int16_t)(plc_blockl+3-1));

+ max16=WebRtcSpl_MaxAbsValueW16(regressor, plc_blockl + 3 - 1);

if (max16>5000)

shifts=2;

else

@@ -339,7 +338,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */

synt,

&iLBCdec_inst->old_syntdenum[

(iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],

- LPC_FILTERORDER+1, (int16_t)lag);

+ LPC_FILTERORDER+1, lag);

WEBRTC_SPL_MEMCPY_W16(&synt[-LPC_FILTERORDER], &synt[lag-LPC_FILTERORDER],

LPC_FILTERORDER);

@@ -350,7 +349,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */

enh_bufPtr1, synt,

&iLBCdec_inst->old_syntdenum[

(iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],

- LPC_FILTERORDER+1, (int16_t)lag);

+ LPC_FILTERORDER+1, lag);

WEBRTC_SPL_MEMCPY_W16(iLBCdec_inst->syntMem, &synt[lag-LPC_FILTERORDER],

LPC_FILTERORDER);