- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2476 - freeswitch/branches/nanocom
by Freeswitch SVN 01 Sep '06

01 Sep '06

Author: sphere Date: Fri Sep 1 10:16:46 2006 New Revision: 2476 Added: freeswitch/branches/nanocom/ Log: Creating empty folder for nanocom

1 0

[commit] r2475 - freeswitch/branches/shahzad
by Freeswitch SVN 01 Sep '06

01 Sep '06

Author: sphere Date: Fri Sep 1 09:43:50 2006 New Revision: 2475 Added: freeswitch/branches/shahzad/ Log: Creating empty folder for shahzad

1 0

[commit] r2474 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Thu Aug 31 17:46:39 2006 New Revision: 2474 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: more tweaks Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile Thu Aug 31 17:46:39 2006 @@ -1,5 +1,5 @@ CFLAGS += -I$(PREFIX)/include/amr -LDFLAGS +=-lamr +LDFLAGS +=-lamrnb all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Thu Aug 31 17:46:39 2006 @@ -32,7 +32,7 @@ * */ #include "switch.h" -#include "amr.h" +#include "amr-nb/amr-nb.h" /* * Check section 8.1 of rfc3267 for possible sdp options.

1 0

[commit] r2473 - freeswitch/trunk/libs/codec/lpc10
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Thu Aug 31 15:39:57 2006 New Revision: 2473 Removed: freeswitch/trunk/libs/codec/lpc10/autoscan.log Log: clean up

1 0

[commit] r2472 - freeswitch/branches/mazizeh
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: sphere Date: Thu Aug 31 06:52:48 2006 New Revision: 2472 Added: freeswitch/branches/mazizeh/ Log: Creating empty folder for mazizeh

1 0

[commit] r2471 - freeswitch/branches/wallicee
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: sphere Date: Thu Aug 31 06:37:45 2006 New Revision: 2471 Added: freeswitch/branches/wallicee/ Log: Creating empty folder for wallicee

1 0

[commit] r2470 - freeswitch/branches/xixihaha100
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: sphere Date: Wed Aug 30 23:22:44 2006 New Revision: 2470 Added: freeswitch/branches/xixihaha100/ Log: Creating empty folder for xixihaha100

1 0

[commit] r2469 - freeswitch/trunk
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Wed Aug 30 22:13:52 2006 New Revision: 2469 Modified: freeswitch/trunk/AUTHORS Log: update Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Wed Aug 30 22:13:52 2006 @@ -16,9 +16,9 @@ people who have submitted patches, reported bugs, and generally made Freeswitch that much better: - Joshua Colp - For his help making mod_exosip possible, and for just being a swell guy! Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, - and moral support. + and moral support. Xcode project files. + Joshua Colp - For his help making mod_exosip possible, and for just being a swell guy! Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com>

1 0

[commit] r2468 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Wed Aug 30 22:08:47 2006 New Revision: 2468 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: Some devices need the 'a' there which is dumb Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Wed Aug 30 22:08:47 2006 @@ -36,14 +36,11 @@ static const char modname[] = "mod_g729"; - struct g729_context { - struct dec_state decoder_object; struct cod_state encoder_object; }; - static switch_status_t switch_g729_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { @@ -73,15 +70,12 @@ } } - static switch_status_t switch_g729_destroy(switch_codec_t *codec) { codec->private_info = NULL; return SWITCH_STATUS_SUCCESS; } - - static switch_status_t switch_g729_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -94,7 +88,6 @@ uint32_t *encoded_rate, unsigned int *flag) { - struct g729_context *context = codec->private_info; int cbret = 0; @@ -123,12 +116,9 @@ return SWITCH_STATUS_FALSE; } } - return SWITCH_STATUS_SUCCESS; } - - static switch_status_t switch_g729_decode(switch_codec_t *codec, switch_codec_t *other_codec, void *encoded_data, @@ -141,7 +131,6 @@ uint32_t *decoded_rate, unsigned int *flag) { - struct g729_context *context = codec->private_info; int divisor = 10; int plen = 10; @@ -168,15 +157,10 @@ if (encoded_data_len % divisor == 0) { uint8_t *test; - int loops = (int) encoded_data_len / divisor; - char *edp = encoded_data; - short *ddp = decoded_data; - int x; - uint32_t new_len = 0; test = (uint8_t *) encoded_data; @@ -209,15 +193,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "yo this frame is an odd size [%d]\n", encoded_data_len); return SWITCH_STATUS_FALSE; } - - - return SWITCH_STATUS_SUCCESS; - } - - /* Registration */ static const switch_codec_implementation_t g729_10ms_8k_implementation = { @@ -259,13 +237,51 @@ &g729_10ms_8k_implementation }; +static const switch_codec_implementation_t g729a_10ms_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.samples_per_second */ 8000, + /*.bits_per_second */ 32000, + /*.microseconds_per_frame */ 10000, + /*.samples_per_frame */ 80, + /*.bytes_per_frame */ 160, + /*.encoded_bytes_per_frame */ 10, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729_8k_implementation +}; +static const switch_codec_implementation_t g729a_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 20000, + /*.samples_per_frame */ 160, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 20, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729a_10ms_8k_implementation +}; + static const switch_codec_interface_t g729_codec_interface = { /*.interface_name */ "g729", - /*.implementations */ &g729_8k_implementation, + /*.implementations */ &g729a_8k_implementation, }; - static switch_loadable_module_interface_t g729_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -275,17 +291,12 @@ /*.application_interface */ NULL }; - - SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { - /* connect my internal structure to the blank pointer passed to me */ *module_interface = &g729_module_interface; - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; - }

1 0

[commit] r2467 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Wed Aug 30 21:48:17 2006 New Revision: 2467 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: more work Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Wed Aug 30 21:48:17 2006 @@ -63,7 +63,7 @@ struct amr_context { void *encoder_state; void *decoder_state; - int mode; + int enc_mode; }; enum @@ -105,7 +105,7 @@ return SWITCH_STATUS_FALSE; } else { - context->mode = AMR_Mode; /* start in mode 7 */ + context->enc_mode = AMR_Mode; /* start in mode 7 */ context->encoder_state = NULL; context->decoder_state = NULL; @@ -155,7 +155,7 @@ return SWITCH_STATUS_FALSE; } - *encoded_data_len = Encoder_Interface_Encode(context->encoder_state, context->mode, (void *)decoded_data, encoded_data, 0); + *encoded_data_len = Encoder_Interface_Encode( context->encoder_state, context->enc_mode, (void *)decoded_data, encoded_data, 0 ); return SWITCH_STATUS_SUCCESS; } @@ -173,14 +173,15 @@ unsigned int *flag) { struct amr_context *context = codec->private_info; + //int dec_mode; - context->mode = *(char *)encoded_data & 0xF; + //dec_mode = (*(char *)encoded_data >> 3) & 0xF; if (!context) { return SWITCH_STATUS_FALSE; } - Decoder_Interface_Decode( context, (void *)encoded_data, (void *)decoded_data, 0 ); + Decoder_Interface_Decode( context->decoder_state, (void *)encoded_data, (void *)decoded_data, 0 ); *decoded_data_len = codec->implementation->samples_per_frame;

1 0