rearrange codecs so we don't have crazy overlap and remove G723-32 and move it up...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16251 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/codecs/mod_speex/mod_speex.c b/src/mod/codecs/mod_speex/mod_speex.c
index 8fe159be34151d1df475cf43acd9ed63643f9758..732625c658a2dad3daa5f6c9fbcc0072f1f3157e 100644 (file)
--- 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 73dab1129c4c105e46591610a6230668a2422b77..070cac91bfdf1e0f7ffb2f36042bf2a86a245165 100644 (file)
--- 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 */