Revision

16251

Author

brian

Date

2010-01-11 18:30:04 -0600 (Mon, 11 Jan 2010)

Log Message

 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

Modified Paths

• freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c
• freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c

Diff

--- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c	2010-01-12 00:05:11 UTC (rev 16250)
+++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c	2010-01-12 00:30:04 UTC (rev 16251)
@@ -265,7 +265,7 @@
 {
 	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);

--- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c	2010-01-12 00:05:11 UTC (rev 16250)
+++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c	2010-01-12 00:30:04 UTC (rev 16251)
@@ -692,7 +692,7 @@
 		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_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_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_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_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 */