From 93d17cd5239742269002d41dd70f8c093854f116 Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 8 Sep 2006 20:38:24 +0000 Subject: [PATCH] tweaks git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2586 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/codecs/mod_g723_1/mod_g723_1.c | 39 +++++--------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/src/mod/codecs/mod_g723_1/mod_g723_1.c b/src/mod/codecs/mod_g723_1/mod_g723_1.c index d7d9a57995..47b1b2ee82 100644 --- a/src/mod/codecs/mod_g723_1/mod_g723_1.c +++ b/src/mod/codecs/mod_g723_1/mod_g723_1.c @@ -179,7 +179,7 @@ static switch_status_t switch_g723_decode(switch_codec_t *codec, /* Registration */ -static const switch_codec_implementation_t g723_1_30ms_implementation = { +static const switch_codec_implementation_t g723_1_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 4, /*.iananame */ "G723", @@ -191,49 +191,24 @@ static const switch_codec_implementation_t g723_1_30ms_implementation = { /*.encoded_bytes_per_frame */ 24, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, - /*.max_frames_per_packet */ 2, + /*.max_frames_per_packet */ 4, /*.init */ switch_g723_init, /*.encode */ switch_g723_encode, /*.decode */ switch_g723_decode, /*.destroy */ switch_g723_destroy, }; -#if 0 -static const switch_codec_implementation_t g723_1_60ms_implementation = { - /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 4, - /*.iananame */ "G723", - /*.samples_per_second */ 8000, - /*.bits_per_second */ 6300, - /*.microseconds_per_frame */ 60000, - /*.samples_per_frame */ 240, - /*.bytes_per_frame */ 480, - /*.encoded_bytes_per_frame */ 24, - /*.number_of_channels */ 1, - /*.pref_frames_per_packet */ 2, - /*.max_frames_per_packet */ 2, - /*.init */ switch_g723_init, - /*.encode */ switch_g723_encode, - /*.decode */ switch_g723_decode, - /*.destroy */ switch_g723_destroy, -}; -#endif -static const switch_codec_interface_t g723_1_30ms_codec_interface = { + +static const switch_codec_interface_t g723_1_codec_interface = { /*.interface_name */ "g723.1 6.3k", - /*.implementations */ &g723_1_30ms_implementation, + /*.implementations */ &g723_1_implementation, }; -#if 0 -static const switch_codec_interface_t g723_1_60ms_codec_interface = { - /*.interface_name */ "g723.1 6.3k", - /*.implementations */ &g723_1_60ms_implementation, - /*.next */ &g723_1_30ms_codec_interface -}; -#endif + static switch_loadable_module_interface_t g723_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, /*.timer_interface */ NULL, /*.dialplan_interface */ NULL, - /*.codec_interface */ &g723_1_30ms_codec_interface, + /*.codec_interface */ &g723_1_codec_interface, /*.application_interface */ NULL };