- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7556 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Fri Feb 8 12:18:15 2008 New Revision: 7556 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add some more debug stuff. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Feb 8 12:18:15 2008 @@ -1850,6 +1850,7 @@ } if (switch_channel_test_flag(channel_a, CF_BYPASS_MEDIA)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer on bypass media not allowed.\n"); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); goto done; @@ -1987,6 +1988,7 @@ switch_core_session_rwunlock(t_session); switch_channel_hangup(hup_channel, SWITCH_CAUSE_ATTENDED_TRANSFER); } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session to transfer to not found.\n"); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());

1 0

[commit] r7555 - in freeswitch/trunk: . build libs/codec/lpc10 src/mod/codecs/mod_lpc10 src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: brian Date: Fri Feb 8 12:13:54 2008 New Revision: 7555 Added: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Removed: freeswitch/trunk/libs/codec/lpc10/ freeswitch/trunk/src/mod/codecs/mod_lpc10/ Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/build/modules.conf.in freeswitch/trunk/configure.in Log: Adding mod_voipcodecs using Steve Underwoods voipcodecs library. This isn't default yet. /b Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri Feb 8 12:13:54 2008 @@ -3,7 +3,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel voipcodecs \ +SUBDIRS="codec/g7xx codec/gsm codec/ilbc curl iax iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Feb 8 12:13:54 2008 @@ -22,9 +22,9 @@ codecs/mod_g729 codecs/mod_gsm #codecs/mod_h26x +#codecs/mod_voipcodecs codecs/mod_ilbc codecs/mod_l16 -#codecs/mod_lpc10 codecs/mod_speex #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Feb 8 12:13:54 2008 @@ -465,7 +465,6 @@ AC_CONFIG_SUBDIRS(libs/voipcodecs) AC_CONFIG_SUBDIRS(libs/codec/gsm) AC_CONFIG_SUBDIRS(libs/codec/ilbc) -AC_CONFIG_SUBDIRS(libs/codec/lpc10) AC_CONFIG_SUBDIRS(libs/curl) AC_CONFIG_SUBDIRS(libs/iax) AC_CONFIG_SUBDIRS(libs/iksemel) Added: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile Fri Feb 8 12:13:54 2008 @@ -0,0 +1,13 @@ +BASE=../../../.. + +VOIPCODECS_DIR=$(BASE)/libs/voipcodecs +VOIPCODECS_LA=$(VOIPCODECS_DIR)/src/libvoipcodecs.la + +LOCAL_CFLAGS=-I$(VOIPCODECS_DIR)/src +LOCAL_LIBADD=$(VOIPCODECS_LA) + +include $(BASE)/build/modmake.rules + +$(VOIPCODECS_LA): $(VOIPCODECS_DIR) $(VOIPCODECS_DIR)/.update + cd $(VOIPCODECS_DIR) && $(MAKE) + $(TOUCH_TARGET) Added: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Fri Feb 8 12:13:54 2008 @@ -0,0 +1,706 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / G722 codec module + * + * The Initial Developer of the Original Code is + * Brian K. West <brian.west(a)mac.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Brian K. West <brian.west(a)mac.com> + * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> + * + * mod_voipcodecs.c -- VoIP Codecs (G.711, G.722, G.726, GSM-FR, IMA_ADPCM, LPC10) + * + * This module wouldn't be possible without generous contributions from Steve Underwood. Thanks! + * + */ + +#include <switch.h> +#include "voipcodecs.h" + +SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load); +SWITCH_MODULE_DEFINITION(mod_voipcodecs, mod_voipcodecs_load, NULL, NULL); + +/* LPC10 - START */ + +struct lpc10_context { + lpc10_encode_state_t encoder_object; + lpc10_decode_state_t decoder_object; +}; + +static switch_status_t switch_lpc10_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct lpc10_context *context = NULL; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct lpc10_context))))) { + return SWITCH_STATUS_FALSE; + } else { + + if (encoding) { + lpc10_encode_init(&context->encoder_object, TRUE); + } + + if (decoding) { + lpc10_decode_init(&context->decoder_object, TRUE); + } + + codec->private_info = context; + + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_lpc10_destroy(switch_codec_t *codec) +{ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_lpc10_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + struct lpc10_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = lpc10_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 360); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_lpc10_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + struct lpc10_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *decoded_data_len = (2 * lpc10_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len / 7)); + + return SWITCH_STATUS_SUCCESS; +} + +/* LPC10 - END */ + + +/* GSM - START */ +struct gsm_context { + gsm0610_state_t decoder_object; + gsm0610_state_t encoder_object; +}; + +static switch_status_t switch_gsm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct gsm_context *context = NULL; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { + return SWITCH_STATUS_FALSE; + } else { + if (encoding) { + gsm0610_init(&context->encoder_object, GSM0610_PACKING_VOIP); + } + if (decoding) { + gsm0610_init(&context->decoder_object, GSM0610_PACKING_VOIP); + } + + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_gsm_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + struct gsm_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = gsm0610_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_gsm_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + struct gsm_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *decoded_data_len = (2 * gsm0610_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_gsm_destroy(switch_codec_t *codec) +{ + /* We do not need to use release here as the pool memory is taken care of for us */ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} +/* GSM - END */ + +/* G711 - START */ +static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { + return SWITCH_STATUS_FALSE; + } else { + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_g711u_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf[i] = linear_to_ulaw(dbuf[i]); + } + + *encoded_data_len = i; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711u_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf, 0, codec->implementation->bytes_per_frame); + *decoded_data_len = codec->implementation->bytes_per_frame; + } else { + for (i = 0; i < encoded_data_len; i++) { + dbuf[i] = ulaw_to_linear(ebuf[i]); + } + + *decoded_data_len = i * 2; + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711u_destroy(switch_codec_t *codec) +{ + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t switch_g711a_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { + return SWITCH_STATUS_FALSE; + } else { + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_g711a_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf[i] = linear_to_alaw(dbuf[i]); + } + + *encoded_data_len = i; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711a_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf, 0, codec->implementation->bytes_per_frame); + *decoded_data_len = codec->implementation->bytes_per_frame; + } else { + for (i = 0; i < encoded_data_len; i++) { + dbuf[i] = alaw_to_linear(ebuf[i]); + } + + *decoded_data_len = i * 2; + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711a_destroy(switch_codec_t *codec) +{ + return SWITCH_STATUS_SUCCESS; +} + +/* G711 - END */ + +/* G722 - START */ + +struct g722_context { + g722_decode_state_t decoder_object; + g722_encode_state_t encoder_object; +}; + +static switch_status_t switch_g722_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct g722_context *context = NULL; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) { + return SWITCH_STATUS_FALSE; + } else { + if (encoding) { + g722_encode_init(&context->encoder_object, 64000, G722_PACKED); + } + if (decoding) { + g722_decode_init(&context->decoder_object, 64000, G722_PACKED); + } + } + + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g722_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + struct g722_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = g722_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g722_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + struct g722_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *decoded_data_len = (2 * g722_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g722_destroy(switch_codec_t *codec) +{ + /* We do not need to use release here as the pool memory is taken care of for us */ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +/* G722 - END */ + +/* G726 - START */ + +static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + int packing = G726_PACKING_RIGHT; + g726_state_t *context; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { + return SWITCH_STATUS_FALSE; + } else { + if ((flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2"))) { + packing = G726_PACKING_LEFT; + } + + g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); + + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_g726_destroy(switch_codec_t *codec) +{ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g726_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + g726_state_t *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = g726_encode(context, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g726_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + g726_state_t *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *decoded_data_len = (2 * g726_decode(context, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); + + return SWITCH_STATUS_SUCCESS; +} + +/* G726 - START */ + +/* IMA_ADPCM - START */ + +struct ima_adpcm_context { + ima_adpcm_state_t decoder_object; + ima_adpcm_state_t encoder_object; +}; + +static switch_status_t switch_adpcm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct ima_adpcm_context *context = NULL; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { + return SWITCH_STATUS_FALSE; + } else { + if (encoding) { + ima_adpcm_init(&context->encoder_object, IMA_ADPCM_DVI4); + } + if (decoding) { + ima_adpcm_init(&context->decoder_object, IMA_ADPCM_DVI4); + } + + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_adpcm_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + struct ima_adpcm_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = ima_adpcm_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_adpcm_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + struct ima_adpcm_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *decoded_data_len = (2 * ima_adpcm_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_adpcm_destroy(switch_codec_t *codec) +{ + /* We do not need to use release here as the pool memory is taken care of for us */ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +/* IMA_ADPCM - END */ + + +SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) +{ + switch_codec_interface_t *codec_interface; + int mpf, spf, bpf, ebpf, count; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + /* IMA_ADPCM */ + mpf = 10000, spf = 80, bpf = 160, ebpf = 80; + SWITCH_ADD_CODEC(codec_interface, "ADPCM (IMA)"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 5, "DVI4", NULL, 8000, 8000, 32000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_adpcm_init, switch_adpcm_encode, switch_adpcm_decode, switch_adpcm_destroy); + } + mpf = 10000, spf = 160, bpf = 360, ebpf = 160; + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 6, "DVI4", NULL, 16000, 16000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_adpcm_init, switch_adpcm_encode, switch_adpcm_decode, switch_adpcm_destroy); + } + + /* G726 */ + mpf = 10000, spf = 80, bpf = 160, ebpf = 20; + SWITCH_ADD_CODEC(codec_interface, "G.726 16k (AAL2)"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 124, "AAL2-G726-16", NULL, 8000, 8000, 16000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + SWITCH_ADD_CODEC(codec_interface, "G.726 16k"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 127, "G726-16", NULL, 8000, 8000, 16000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + /* Increase encoded bytes per frame by 10 */ + ebpf = ebpf + 10; + + SWITCH_ADD_CODEC(codec_interface, "G.726 24k (AAL2)"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 123, "AAL2-G726-24", NULL, 8000, 8000, 24000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + SWITCH_ADD_CODEC(codec_interface, "G.726 24k"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 126, "G726-24", NULL, 8000, 8000, 24000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + /* Increase encoded bytes per frame by 10 */ + ebpf = ebpf + 10; + + SWITCH_ADD_CODEC(codec_interface, "G.726 32k (AAL2)"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 2, "AAL2-G726-32", NULL, 8000, 8000, 32000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + SWITCH_ADD_CODEC(codec_interface, "G.726 32k"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 2, "G726-32", NULL, 8000, 8000, 32000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + /* Increase encoded bytes per frame by 10 */ + ebpf = ebpf + 10; + + SWITCH_ADD_CODEC(codec_interface, "G.726 40k (AAL2)"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 122, "AAL2-G726-40", NULL, 8000, 8000, 40000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + SWITCH_ADD_CODEC(codec_interface, "G.726 40k"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 125, "G726-40", NULL, 8000, 8000, 40000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g726_init, switch_g726_encode, switch_g726_decode, switch_g726_destroy); + } + + /* G722 */ + mpf = 10000, spf = 80, bpf = 320, ebpf = 80; + SWITCH_ADD_CODEC(codec_interface, "G.722"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 9, "G722", NULL, 8000, 16000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g722_init, switch_g722_encode, switch_g722_decode, switch_g722_destroy); + } + + /* G711 */ + mpf = 10000, spf = 80, bpf = 160, ebpf = 80; + SWITCH_ADD_CODEC(codec_interface, "G.711 ulaw"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 0, "PCMU", NULL, 8000, 8000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g711u_init, switch_g711u_encode, switch_g711u_decode, switch_g711u_destroy); + } + + SWITCH_ADD_CODEC(codec_interface, "G.711 alaw"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 8, "PCMA", NULL, 8000, 8000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g711a_init, switch_g711a_encode, switch_g711a_decode, switch_g711a_destroy); + } + + /* GSM */ + mpf = 20000, spf = 160, bpf = 320, ebpf = 33; + SWITCH_ADD_CODEC(codec_interface, "GSM"); + for (count = 6; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 3, "GSM", NULL, 8000, 8000, 13200, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 6, + switch_gsm_init, switch_gsm_encode, switch_gsm_decode, switch_gsm_destroy); + } + /* LPC10 */ + SWITCH_ADD_CODEC(codec_interface, "LPC-10"); + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, + 90000, 720, 1440, 28, 1, 1, 1, + switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7554 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: anthm Date: Fri Feb 8 10:44:39 2008 New Revision: 7554 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: small fix Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Feb 8 10:44:39 2008 @@ -916,18 +916,17 @@ } } - if (!reason && code != 407) { - reason = "Call Refused"; - } - if (!code) { code = 488; } - - if (!reason) { - reason = sip_status_phrase(code); - if (switch_strlen_zero(reason)) { - reason = "Because"; + + if (!reason && code != 407) { + reason = "Call Refused"; + if (!reason) { + reason = sip_status_phrase(code); + if (switch_strlen_zero(reason)) { + reason = "Because"; + } } }

1 0

[commit] r7553 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: brian Date: Fri Feb 8 10:17:52 2008 New Revision: 7553 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix transfer 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 Fri Feb 8 10:17:52 2008 @@ -701,11 +701,7 @@ switch_core_session_t *tsession = NULL, *other_session = NULL; char *mycmd = NULL, *argv[5] = { 0 }; int argc = 0; - char *tuuid = argv[0]; - char *dest = argv[1]; - char *dp = argv[2]; - char *context = argv[3]; - char *arg = NULL; + char *tuuid, *dest, *dp, *context, *arg = NULL; if (session) { return SWITCH_STATUS_FALSE; @@ -722,6 +718,11 @@ goto done; } + tuuid = argv[0]; + dest = argv[1]; + dp = argv[2]; + context = argv[3]; + if (!(tsession = switch_core_session_locate(tuuid))) { stream->write_function(stream, "-ERR No Such Channel!\n"); goto done;

1 0

[commit] r7552 - freeswitch/trunk/libs/voipcodecs
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Thu Feb 7 19:52:12 2008 New Revision: 7552 Added: freeswitch/trunk/libs/voipcodecs/.update Log: update Added: freeswitch/trunk/libs/voipcodecs/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/.update Thu Feb 7 19:52:12 2008 @@ -0,0 +1 @@ +Thu Feb 7 18:52:01 CST 2008

1 0

[commit] r7551 - in freeswitch/trunk/libs: libedit libedit/doc libedit/examples libedit/src voipcodecs voipcodecs/config voipcodecs/doc voipcodecs/etsitests voipcodecs/itutests voipcodecs/localtests voipcodecs/src voipcodecs/tests
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Thu Feb 7 19:38:38 2008 New Revision: 7551 Modified: freeswitch/trunk/libs/libedit/ (props changed) freeswitch/trunk/libs/libedit/doc/ (props changed) freeswitch/trunk/libs/libedit/examples/ (props changed) freeswitch/trunk/libs/libedit/src/ (props changed) freeswitch/trunk/libs/voipcodecs/ (props changed) freeswitch/trunk/libs/voipcodecs/config/ (props changed) freeswitch/trunk/libs/voipcodecs/doc/ (props changed) freeswitch/trunk/libs/voipcodecs/etsitests/ (props changed) freeswitch/trunk/libs/voipcodecs/itutests/ (props changed) freeswitch/trunk/libs/voipcodecs/localtests/ (props changed) freeswitch/trunk/libs/voipcodecs/src/ (props changed) freeswitch/trunk/libs/voipcodecs/tests/ (props changed) Log: svn:ignore props

1 0

[commit] r7550 - freeswitch/trunk/libs/libedit
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Thu Feb 7 19:31:42 2008 New Revision: 7550 Modified: freeswitch/trunk/libs/libedit/configure.ac Log: whoops Modified: freeswitch/trunk/libs/libedit/configure.ac ============================================================================== --- freeswitch/trunk/libs/libedit/configure.ac (original) +++ freeswitch/trunk/libs/libedit/configure.ac Thu Feb 7 19:31:42 2008 @@ -3,7 +3,7 @@ AC_INIT(libedit, [EL_RELEASE],, libedit-[EL_TIMESTAMP_CVSEXPORT]) AC_CONFIG_SRCDIR([src/strlcat.c]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE AC_PROG_LIBTOOL

1 0

[commit] r7549 - freeswitch/trunk/libs/libedit
by Freeswitch SVN 07 Feb '08

07 Feb '08

Author: mikej Date: Thu Feb 7 18:56:22 2008 New Revision: 7549 Removed: freeswitch/trunk/libs/libedit/config.h.in Log: remove generated file, you will need to re-bootstrap. sorry :(

1 0

[commit] r7548 - in freeswitch/trunk: . libs/voipcodecs
by Freeswitch SVN 07 Feb '08

07 Feb '08

Author: mikej Date: Thu Feb 7 18:55:24 2008 New Revision: 7548 Added: freeswitch/trunk/libs/voipcodecs/configure.gnu Removed: freeswitch/trunk/libs/voipcodecs/config-h.in Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/configure.in freeswitch/trunk/libs/voipcodecs/configure.ac Log: voipcodecs configure tweaks, add to build system Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Thu Feb 7 18:55:24 2008 @@ -3,7 +3,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel \ +SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Feb 7 18:55:24 2008 @@ -462,6 +462,7 @@ AC_CONFIG_SUBDIRS(libs/apr) AC_CONFIG_SUBDIRS(libs/apr-util) AC_CONFIG_SUBDIRS(libs/codec/g7xx) +AC_CONFIG_SUBDIRS(libs/voipcodecs) AC_CONFIG_SUBDIRS(libs/codec/gsm) AC_CONFIG_SUBDIRS(libs/codec/ilbc) AC_CONFIG_SUBDIRS(libs/codec/lpc10) Modified: freeswitch/trunk/libs/voipcodecs/configure.ac ============================================================================== --- freeswitch/trunk/libs/voipcodecs/configure.ac (original) +++ freeswitch/trunk/libs/voipcodecs/configure.ac Thu Feb 7 18:55:24 2008 @@ -242,14 +242,9 @@ fi # Checks for libraries. -AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS) -AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS) -AC_CHECK_LIB([X11], [XOpenDisplay], TESTLIBS="$TESTLIBS -lX11",, $TESTLIBS) -AC_CHECK_LIB([tiff], [TIFFOpen], , AC_MSG_ERROR("Can't build without libtiff (does your system require a libtiff-devel package?)"), -lm) AC_CHECK_LIB([m], [cos]) AC_CHECK_LIB([m], [pow]) AC_CHECK_LIB([m], [sqrt]) -AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) TESTLIBS="$TESTLIBS -lxml2"]) if test -n "$enable_tests" ; then AC_LANG([C++]) AC_CHECK_LIB([fltk], [main], TESTLIBS="$TESTLIBS -lfltk -lsupc++") @@ -262,6 +257,10 @@ AC_CHECK_LIB([pthread], [pthread_attr_init], TESTLIBS="$TESTLIBS -lpthread") AC_CHECK_LIB([dl], [dlopen], TESTLIBS="$TESTLIBS -ldl") AC_CHECK_LIB([unicall], [uc_start], TESTLIBS="$TESTLIBS -lunicall",, -ltiff -ldl) + AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS) + AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS) + AC_CHECK_LIB([X11], [XOpenDisplay], TESTLIBS="$TESTLIBS -lX11",, $TESTLIBS) + AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) TESTLIBS="$TESTLIBS -lxml2"]) fi case "${ax_cv_c_compiler_vendor}" in Added: freeswitch/trunk/libs/voipcodecs/configure.gnu ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/configure.gnu Thu Feb 7 18:55:24 2008 @@ -0,0 +1,2 @@ +#! /bin/sh +./configure "$@" --disable-shared --with-pic

1 0

[commit] r7547 - freeswitch/trunk
by Freeswitch SVN 07 Feb '08

07 Feb '08

Author: cypromis Date: Thu Feb 7 18:45:11 2008 New Revision: 7547 Modified: freeswitch/trunk/Makefile.am Log: force libtool to leave -lodbc alone and not replace it by /usr/lib/libodbc.so since that drives the dynamic detection of platform dependant libodbc.so nuts Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Feb 7 18:45:11 2008 @@ -154,7 +154,7 @@ if ADD_ODBC CORE_CFLAGS += -DSWITCH_HAVE_ODBC libfreeswitch_la_SOURCES += src/switch_odbc.c -libfreeswitch_la_LDFLAGS += -lodbc +libfreeswitch_la_LDFLAGS += -Wl,-lodbc endif bin_SCRIPTS = scripts/gentls_cert scripts/fsxs

1 0