From 4c217dbebd71bb9bf9fb73fb15090590a4dae4cf Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 12 Jan 2010 00:30:04 +0000 Subject: [PATCH] rearrange codecs so we don't have crazy overlap and remove G723-32 and move it up to dynamic cuz people have nothing better to do then write stupid RFC's git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16251 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/codecs/mod_speex/mod_speex.c | 2 +- src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mod/codecs/mod_speex/mod_speex.c b/src/mod/codecs/mod_speex/mod_speex.c index 8fe159be34..732625c658 100644 --- a/src/mod/codecs/mod_speex/mod_speex.c +++ b/src/mod/codecs/mod_speex/mod_speex.c @@ -265,7 +265,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_speex_load) { switch_codec_interface_t *codec_interface; int mpf = 20000, spf = 160, bpf = 320, rate = 8000, counta, countb; - switch_payload_t ianacode[4] = { 0, 98, 99, 103 }; + switch_payload_t ianacode[4] = { 0, 99, 99, 99 }; int bps[4] = { 0, 24600, 42200, 44000 }; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c index 73dab1129c..070cac91bf 100644 --- a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c +++ b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c @@ -692,7 +692,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 127, /* the IANA code number */ + 124, /* the IANA code number */ "G726-16", /* the IANA code name */ NULL, /* default fmtp to send (can be overridden by the init function) */ 8000, /* samples transferred per second */ @@ -765,7 +765,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 2, /* the IANA code number */ + 122, /* the IANA code number */ "AAL2-G726-32", /* the IANA code name */ NULL, /* default fmtp to send (can be overridden by the init function) */ 8000, /* samples transferred per second */ @@ -787,7 +787,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 2, /* the IANA code number */ + 122, /* the IANA code number */ "G726-32", /* the IANA code name */ NULL, /* default fmtp to send (can be overridden by the init function) */ 8000, /* samples transferred per second */ @@ -812,7 +812,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 122, /* the IANA code number */ + 121, /* the IANA code number */ "AAL2-G726-40", /* the IANA code name */ NULL, /* default fmtp to send (can be overridden by the init function) */ 8000, /* samples transferred per second */ @@ -834,7 +834,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 125, /* the IANA code number */ + 121, /* the IANA code number */ "G726-40", /* the IANA code name */ NULL, /* default fmtp to send (can be overridden by the init function) */ 8000, /* samples transferred per second */