From d8f8b3252135194368b3f942e4e8b6c205618143 Mon Sep 17 00:00:00 2001 From: "pwestin@webrtc.org" Date: Thu, 22 Dec 2011 12:19:43 +0000 Subject: [PATCH] Cleaned up leaky symbols in iSAC. Review URL: http://webrtc-codereview.appspot.com/329014 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1286 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/codecs/iSAC/fix/source/decode_plc.c | 2 +- .../audio_coding/codecs/iSAC/main/source/encode_lpc_swb.c | 4 ++-- src/modules/audio_coding/codecs/iSAC/main/source/isac.c | 4 ++-- .../codecs/iSAC/main/source/lpc_shape_swb16_tables.c | 2 +- .../codecs/iSAC/main/source/lpc_shape_swb16_tables.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/audio_coding/codecs/iSAC/fix/source/decode_plc.c b/src/modules/audio_coding/codecs/iSAC/fix/source/decode_plc.c index 3419cdddc..de5165872 100644 --- a/src/modules/audio_coding/codecs/iSAC/fix/source/decode_plc.c +++ b/src/modules/audio_coding/codecs/iSAC/fix/source/decode_plc.c @@ -33,7 +33,7 @@ * returns the total number of bytes in the stream */ -WebRtc_Word16 plc_filterma_Fast( +static WebRtc_Word16 plc_filterma_Fast( WebRtc_Word16 *In, /* (i) Vector to be filtered. InOut[-orderCoef+1] to InOut[-1] contains state */ WebRtc_Word16 *Out, /* (o) Filtered vector */ diff --git a/src/modules/audio_coding/codecs/iSAC/main/source/encode_lpc_swb.c b/src/modules/audio_coding/codecs/iSAC/main/source/encode_lpc_swb.c index 1881db21e..2bf4c3646 100644 --- a/src/modules/audio_coding/codecs/iSAC/main/source/encode_lpc_swb.c +++ b/src/modules/audio_coding/codecs/iSAC/main/source/encode_lpc_swb.c @@ -64,7 +64,7 @@ WebRtcIsac_RemoveLarMean( case isac16kHz: { numVec = UB16_LPC_VEC_PER_FRAME; - meanLAR = meanLARUB16; + meanLAR = WebRtcIsac_kMeanLarUb16; break; } default: @@ -516,7 +516,7 @@ WebRtcIsac_AddLarMean( case isac16kHz: { numVec = UB16_LPC_VEC_PER_FRAME; - meanLAR = meanLARUB16; + meanLAR = WebRtcIsac_kMeanLarUb16; break; } default: diff --git a/src/modules/audio_coding/codecs/iSAC/main/source/isac.c b/src/modules/audio_coding/codecs/iSAC/main/source/isac.c index db428e036..5cbd11027 100644 --- a/src/modules/audio_coding/codecs/iSAC/main/source/isac.c +++ b/src/modules/audio_coding/codecs/iSAC/main/source/isac.c @@ -454,7 +454,7 @@ static WebRtc_Word16 EncoderInitUb( (MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES) * sizeof(float)); memcpy(&(instUB->ISACencUB_obj.lastLPCVec), - meanLARUB16, sizeof(double) * UB_LPC_ORDER); + WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER); return statusInit; } @@ -1856,7 +1856,7 @@ WebRtc_Word16 WebRtcIsac_Control( instISAC->instLB.ISACencLB_obj.buffer_index; memcpy(&(instISAC->instUB.ISACencUB_obj.lastLPCVec), - meanLARUB16, sizeof(double) * UB_LPC_ORDER); + WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER); } } diff --git a/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.c b/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.c index 1480fe90b..89f45233f 100644 --- a/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.c +++ b/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.c @@ -23,7 +23,7 @@ /* * Mean value of LAR */ -const double meanLARUB16[UB_LPC_ORDER] = +const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER] = { 0.454978, 0.364747, 0.102999, 0.104523 }; diff --git a/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.h b/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.h index 082f4a8a9..68d08b204 100644 --- a/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.h +++ b/src/modules/audio_coding/codecs/iSAC/main/source/lpc_shape_swb16_tables.h @@ -23,7 +23,7 @@ #include "typedefs.h" -extern const double meanLARUB16[UB_LPC_ORDER]; +extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER]; extern const double WebRtcIsac_kIintraVecDecorrMatUb16[UB_LPC_ORDER][UB_LPC_ORDER];