- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2537 - freeswitch/trunk/src
by Freeswitch SVN 06 Sep '06

06 Sep '06

Author: mikej Date: Wed Sep 6 19:29:03 2006 New Revision: 2537 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix message khz->hz Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Sep 6 19:29:03 2006 @@ -108,7 +108,7 @@ for (ptr = new_module->module_interface->codec_interface; ptr; ptr = ptr->next) { for (impl = ptr->implementations; impl; impl = impl->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, - "Adding Codec '%s' (%s) %dkhz %dms\n", + "Adding Codec '%s' (%s) %dhz %dms\n", impl->iananame, ptr->interface_name, impl->samples_per_second, impl->microseconds_per_frame / 1000);

1 0

[commit] r2535 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 06 Sep '06

06 Sep '06

Author: brian Date: Wed Sep 6 13:57:38 2006 New Revision: 2535 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Log: commit both 8k and 16k versions Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Wed Sep 6 13:57:38 2006 @@ -53,23 +53,22 @@ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) { return SWITCH_STATUS_FALSE; } else { - if (!(encoding || decoding)) { - if (encoding) { - if(codec->implementation->samples_per_second == 16000){ - g722_encode_init(&context->encoder_object, 64000, G722_PACKED); - } else { - g722_encode_init(&context->encoder_object, 64000, G722_SAMPLE_RATE_8000); - } + if (encoding) { + if(codec->implementation->samples_per_second == 16000){ + g722_encode_init(&context->encoder_object, 64000, G722_PACKED); + } else { + g722_encode_init(&context->encoder_object, 64000, G722_SAMPLE_RATE_8000); } - if (decoding) { - if(codec->implementation->samples_per_second == 16000){ - g722_decode_init(&context->decoder_object, 64000, G722_PACKED); - } else { - g722_decode_init(&context->decoder_object, 64000, G722_SAMPLE_RATE_8000); - } + } + if (decoding) { + if(codec->implementation->samples_per_second == 16000){ + g722_decode_init(&context->decoder_object, 64000, G722_PACKED); + } else { + g722_decode_init(&context->decoder_object, 64000, G722_SAMPLE_RATE_8000); } } } + codec->private_info = context; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2534 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 06 Sep '06

06 Sep '06

Author: brian Date: Wed Sep 6 12:11:57 2006 New Revision: 2534 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Log: commit both 8k and 16k versions Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Wed Sep 6 12:11:57 2006 @@ -53,13 +53,20 @@ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) { return SWITCH_STATUS_FALSE; } else { - if (!(encoding || decoding)) { - + if (!(encoding || decoding)) { if (encoding) { - g722_encode_init(&context->encoder_object, 64000, G722_PACKED); + if(codec->implementation->samples_per_second == 16000){ + g722_encode_init(&context->encoder_object, 64000, G722_PACKED); + } else { + g722_encode_init(&context->encoder_object, 64000, G722_SAMPLE_RATE_8000); + } } if (decoding) { - g722_decode_init(&context->decoder_object, 64000, G722_PACKED); + if(codec->implementation->samples_per_second == 16000){ + g722_decode_init(&context->decoder_object, 64000, G722_PACKED); + } else { + g722_decode_init(&context->decoder_object, 64000, G722_SAMPLE_RATE_8000); + } } } } @@ -115,7 +122,7 @@ /* Registration */ -static const switch_codec_implementation_t g722_implementation = { +static const switch_codec_implementation_t g722_8k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 9, /*.iananame */ "G722", @@ -132,12 +139,31 @@ /*.encode */ switch_g722_encode, /*.decode */ switch_g722_decode, /*.destroy */ switch_g722_destroy, - ///*.next */ &g711u_16k_implementation }; +static const switch_codec_implementation_t g722_16k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 9, + /*.iananame */ "G722", + /*.samples_per_second */ 16000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 20000, + /*.samples_per_frame */ 160, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 160, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g722_init, + /*.encode */ switch_g722_encode, + /*.decode */ switch_g722_decode, + /*.destroy */ switch_g722_destroy, + /*.next */ &g722_8k_implementation +}; + static const switch_codec_interface_t g722_codec_interface = { /*.interface_name */ "g722", - /*.implementations */ &g722_implementation + /*.implementations */ &g722_16k_implementation }; static switch_loadable_module_interface_t g722_module_interface = {

1 0

[commit] r2529 - freeswitch/trunk/conf
by Freeswitch SVN 06 Sep '06

06 Sep '06

Author: mikej Date: Tue Sep 5 23:06:25 2006 New Revision: 2529 Modified: freeswitch/trunk/conf/freeswitch.xml Log: comment out dev conf in the sample config, people can use 1234 to test, I will change the getting started guide. Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Sep 5 23:06:25 2006 @@ -386,11 +386,11 @@ </condition> </extension> - <extension name="devconf"> +  <extension name="testmusic"> <condition field="destination_number" expression="^1234$">

1 0

[commit] r2523 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: brian Date: Tue Sep 5 18:21:14 2006 New Revision: 2523 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Log: RTP profile for audio and video conferences with minimal control. This memorandum is a revision of RFC 1890 in preparation for advancement from Proposed Standard to Draft Standard status. Readers are encouraged to use the PostScript form of this draft to see where changes from RFC 1890 are marked by change bars. "G722 is specified in ITU-T Recommendation G.722, "7 kHz audio-coding within 64 kbit/s". The G.722 encoder produces a stream of octets, each of which SHALL be octet-aligned in an RTP packet. The first bit transmitted in the G.722 octet, which is the most significant bit of the higher sub-band sample, SHALL correspond to the most significant bit of the octet in the RTP packet. Even though the actual sampling rate for G.722 audio is 16000 Hz, the RTP clock rate for the G722 payload format is 8000 Hz because that value was erroneously assigned in RFC 1890 and must remain unchanged for backward compatibility. The octet rate or sample-pair rate is 8000 Hz." Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Tue Sep 5 18:21:14 2006 @@ -119,7 +119,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 9, /*.iananame */ "G722", - /*.samples_per_second */ 16000, + /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160,

1 0

[commit] r2522 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: brian Date: Tue Sep 5 18:11:42 2006 New Revision: 2522 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: cleanups 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 Tue Sep 5 18:11:42 2006 @@ -88,8 +88,6 @@ AMR_BITRATE_1220 }; -//static short bytes_per_frame[16]={ 13, 14, 16, 18, 19, 21, 26, 31, 6, 0, 0, 0, 0, 0, 0, 0 }; - #define AMR_Mode 7 static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_t flags, @@ -173,9 +171,6 @@ unsigned int *flag) { struct amr_context *context = codec->private_info; - //int dec_mode; - - //dec_mode = (*(char *)encoded_data >> 3) & 0xF; if (!context) { return SWITCH_STATUS_FALSE;

1 0

[commit] r2521 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: brian Date: Tue Sep 5 18:09:56 2006 New Revision: 2521 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: Thanks stkn 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 Tue Sep 5 18:09:56 2006 @@ -183,7 +183,7 @@ Decoder_Interface_Decode( context->decoder_state, (void *)encoded_data, (void *)decoded_data, 0 ); - *decoded_data_len = codec->implementation->samples_per_frame; + *decoded_data_len = codec->implementation->bytes_per_frame; return SWITCH_STATUS_SUCCESS; } @@ -198,7 +198,7 @@ /*.bits_per_second */ 0, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 0, + /*.bytes_per_frame */ 320, /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1,

1 0

[commit] r2519 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: mikej Date: Tue Sep 5 16:34:17 2006 New Revision: 2519 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix assert when running api originate and not passing an extension. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Sep 5 16:34:17 2006 @@ -255,7 +255,7 @@ timeout = atoi(argv[6]); } - if (!aleg && exten) { + if (!aleg || !exten) { stream->write_function(stream, "Invalid Arguements\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2518 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: mikej Date: Tue Sep 5 14:52:16 2006 New Revision: 2518 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add some syntax and descriptions of api commands and applications. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Sep 5 14:52:16 2006 @@ -123,30 +123,40 @@ static const switch_application_interface_t set_application_interface = { /*.interface_name */ "set", - /*.application_function */ set_function + /*.application_function */ set_function, + /* long_desc */ "Set a channel varaible for the channel calling the application.", + /* short_desc */ "Set a channel varaible.", + /* syntax */ "<varname>=[<value>|_UNDEF_]", + /*.next */ NULL }; static const switch_application_interface_t answer_application_interface = { /*.interface_name */ "answer", /*.application_function */ answer_function, - NULL,NULL,NULL, - &set_application_interface + /* long_desc */ "Answer the call for a channel.", + /* short_desc */ "Answer the call.", + /* syntax */ "", + /*.next */ &set_application_interface }; static const switch_application_interface_t strftime_application_interface = { /*.interface_name */ "strftime", /*.application_function */ strftime_function, - NULL,NULL,NULL, - &answer_application_interface + /* long_desc */ NULL, + /* short_desc */ NULL, + /* syntax */ NULL, + /*.next */ &answer_application_interface }; static const switch_application_interface_t sleep_application_interface = { /*.interface_name */ "sleep", /*.application_function */ sleep_function, - NULL,NULL,NULL, - &strftime_application_interface + /* long_desc */ "Pause the channel for a given number of milliseconds, consuming the audio for that period of time.", + /* short_desc */ "Pause a channel", + /* syntax */ "<pausemilliseconds>", + /* next */ &strftime_application_interface }; static const switch_loadable_module_interface_t mod_dptools_module_interface = {

1 0

[commit] r2517 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 05 Sep '06

05 Sep '06

Author: brian Date: Tue Sep 5 14:50:39 2006 New Revision: 2517 Added: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Log: Makefile for mod_g722 Added: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Tue Sep 5 14:50:39 2006 @@ -0,0 +1,16 @@ +LDFLAGS +=-lg7xx + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/g7xx --prefix=$(PREFIX) + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod

1 0