From ebcb6421b19b9dc4852b7c852f93f706aa8cc9fc Mon Sep 17 00:00:00 2001 From: "pwestin@webrtc.org" Date: Thu, 22 Dec 2011 12:20:06 +0000 Subject: [PATCH] Cleaned up leaky symbols in G722. Review URL: http://webrtc-codereview.appspot.com/333017 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1287 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/codecs/g722/g722_decode.c | 13 +++++---- .../audio_coding/codecs/g722/g722_enc_dec.h | 28 +++++++++++-------- .../audio_coding/codecs/g722/g722_encode.c | 9 +++--- .../audio_coding/codecs/g722/g722_interface.c | 14 +++++----- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/modules/audio_coding/codecs/g722/g722_decode.c b/src/modules/audio_coding/codecs/g722/g722_decode.c index 898190350c..499cc8fa30 100644 --- a/src/modules/audio_coding/codecs/g722/g722_decode.c +++ b/src/modules/audio_coding/codecs/g722/g722_decode.c @@ -155,7 +155,9 @@ static void block4(g722_decode_state_t *s, int band, int d) } /*- End of function --------------------------------------------------------*/ -g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options) +g722_decode_state_t *WebRtc_g722_decode_init(g722_decode_state_t *s, + int rate, + int options) { if (s == NULL) { @@ -181,18 +183,19 @@ g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int opti } /*- End of function --------------------------------------------------------*/ -int g722_decode_release(g722_decode_state_t *s) +int WebRtc_g722_decode_release(g722_decode_state_t *s) { free(s); return 0; } /*- End of function --------------------------------------------------------*/ -int g722_decode(g722_decode_state_t *s, WebRtc_Word16 amp[], - const WebRtc_UWord8 g722_data[], int len) +int WebRtc_g722_decode(g722_decode_state_t *s, WebRtc_Word16 amp[], + const WebRtc_UWord8 g722_data[], int len) { static const int wl[8] = {-60, -30, 58, 172, 334, 538, 1198, 3042 }; - static const int rl42[16] = {0, 7, 6, 5, 4, 3, 2, 1, 7, 6, 5, 4, 3, 2, 1, 0 }; + static const int rl42[16] = {0, 7, 6, 5, 4, 3, 2, 1, + 7, 6, 5, 4, 3, 2, 1, 0 }; static const int ilb[32] = { 2048, 2093, 2139, 2186, 2233, 2282, 2332, diff --git a/src/modules/audio_coding/codecs/g722/g722_enc_dec.h b/src/modules/audio_coding/codecs/g722/g722_enc_dec.h index 802126e241..d2d19b04b1 100644 --- a/src/modules/audio_coding/codecs/g722/g722_enc_dec.h +++ b/src/modules/audio_coding/codecs/g722/g722_enc_dec.h @@ -133,19 +133,23 @@ typedef struct extern "C" { #endif -g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int options); -int g722_encode_release(g722_encode_state_t *s); -int g722_encode(g722_encode_state_t *s, - WebRtc_UWord8 g722_data[], - const WebRtc_Word16 amp[], - int len); +g722_encode_state_t *WebRtc_g722_encode_init(g722_encode_state_t *s, + int rate, + int options); +int WebRtc_g722_encode_release(g722_encode_state_t *s); +int WebRtc_g722_encode(g722_encode_state_t *s, + WebRtc_UWord8 g722_data[], + const WebRtc_Word16 amp[], + int len); -g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options); -int g722_decode_release(g722_decode_state_t *s); -int g722_decode(g722_decode_state_t *s, - WebRtc_Word16 amp[], - const WebRtc_UWord8 g722_data[], - int len); +g722_decode_state_t *WebRtc_g722_decode_init(g722_decode_state_t *s, + int rate, + int options); +int WebRtc_g722_decode_release(g722_decode_state_t *s); +int WebRtc_g722_decode(g722_decode_state_t *s, + WebRtc_Word16 amp[], + const WebRtc_UWord8 g722_data[], + int len); #ifdef __cplusplus } diff --git a/src/modules/audio_coding/codecs/g722/g722_encode.c b/src/modules/audio_coding/codecs/g722/g722_encode.c index 98fa2cd846..7487b64c7f 100644 --- a/src/modules/audio_coding/codecs/g722/g722_encode.c +++ b/src/modules/audio_coding/codecs/g722/g722_encode.c @@ -151,7 +151,8 @@ static void block4(g722_encode_state_t *s, int band, int d) } /*- End of function --------------------------------------------------------*/ -g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int options) +g722_encode_state_t *WebRtc_g722_encode_init(g722_encode_state_t *s, + int rate, int options) { if (s == NULL) { @@ -177,7 +178,7 @@ g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int opti } /*- End of function --------------------------------------------------------*/ -int g722_encode_release(g722_encode_state_t *s) +int WebRtc_g722_encode_release(g722_encode_state_t *s) { free(s); return 0; @@ -201,8 +202,8 @@ WebRtc_Word16 limitValues (WebRtc_Word16 rl) } #endif -int g722_encode(g722_encode_state_t *s, WebRtc_UWord8 g722_data[], - const WebRtc_Word16 amp[], int len) +int WebRtc_g722_encode(g722_encode_state_t *s, WebRtc_UWord8 g722_data[], + const WebRtc_Word16 amp[], int len) { static const int q6[32] = { diff --git a/src/modules/audio_coding/codecs/g722/g722_interface.c b/src/modules/audio_coding/codecs/g722/g722_interface.c index 80bdf25a5e..d559014225 100644 --- a/src/modules/audio_coding/codecs/g722/g722_interface.c +++ b/src/modules/audio_coding/codecs/g722/g722_interface.c @@ -31,7 +31,7 @@ WebRtc_Word16 WebRtcG722_EncoderInit(G722EncInst *G722enc_inst) { // Create and/or reset the G.722 encoder // Bitrate 64 kbps and wideband mode (2) - G722enc_inst = (G722EncInst *) g722_encode_init( + G722enc_inst = (G722EncInst *) WebRtc_g722_encode_init( (g722_encode_state_t*) G722enc_inst, 64000, 2); if (G722enc_inst == NULL) { return -1; @@ -43,7 +43,7 @@ WebRtc_Word16 WebRtcG722_EncoderInit(G722EncInst *G722enc_inst) WebRtc_Word16 WebRtcG722_FreeEncoder(G722EncInst *G722enc_inst) { // Free encoder memory - return g722_encode_release((g722_encode_state_t*) G722enc_inst); + return WebRtc_g722_encode_release((g722_encode_state_t*) G722enc_inst); } WebRtc_Word16 WebRtcG722_Encode(G722EncInst *G722enc_inst, @@ -53,7 +53,7 @@ WebRtc_Word16 WebRtcG722_Encode(G722EncInst *G722enc_inst, { unsigned char *codechar = (unsigned char*) encoded; // Encode the input speech vector - return g722_encode((g722_encode_state_t*) G722enc_inst, + return WebRtc_g722_encode((g722_encode_state_t*) G722enc_inst, codechar, speechIn, len); } @@ -71,7 +71,7 @@ WebRtc_Word16 WebRtcG722_DecoderInit(G722DecInst *G722dec_inst) { // Create and/or reset the G.722 decoder // Bitrate 64 kbps and wideband mode (2) - G722dec_inst = (G722DecInst *) g722_decode_init( + G722dec_inst = (G722DecInst *) WebRtc_g722_decode_init( (g722_decode_state_t*) G722dec_inst, 64000, 2); if (G722dec_inst == NULL) { return -1; @@ -83,7 +83,7 @@ WebRtc_Word16 WebRtcG722_DecoderInit(G722DecInst *G722dec_inst) WebRtc_Word16 WebRtcG722_FreeDecoder(G722DecInst *G722dec_inst) { // Free encoder memory - return g722_decode_release((g722_decode_state_t*) G722dec_inst); + return WebRtc_g722_decode_release((g722_decode_state_t*) G722dec_inst); } WebRtc_Word16 WebRtcG722_Decode(G722DecInst *G722dec_inst, @@ -94,8 +94,8 @@ WebRtc_Word16 WebRtcG722_Decode(G722DecInst *G722dec_inst, { // Decode the G.722 encoder stream *speechType=G722_WEBRTC_SPEECH; - return g722_decode((g722_decode_state_t*) G722dec_inst, - decoded, (WebRtc_UWord8*) encoded, len); + return WebRtc_g722_decode((g722_decode_state_t*) G722dec_inst, + decoded, (WebRtc_UWord8*) encoded, len); } WebRtc_Word16 WebRtcG722_Version(char *versionStr, short len)