December 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3675 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Fri Dec 15 13:55:00 2006 New Revision: 3675 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: mirror fmtp 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 Fri Dec 15 13:55:00 2006 @@ -61,6 +61,9 @@ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g729_context))))) { return SWITCH_STATUS_FALSE; } else { + if (codec->fmtp_in) { + codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in); + } if (encoding) { g729_init_coder(&context->encoder_object, 0);

1 0

[commit] r3674 - freeswitch/trunk/src
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Fri Dec 15 13:02:54 2006 New Revision: 3674 Modified: freeswitch/trunk/src/switch_event.c Log: fix mem issue Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Dec 15 13:02:54 2006 @@ -600,7 +600,7 @@ { switch_size_t len = 0; switch_event_header_t *hp; - switch_size_t llen = 0, dlen = 0, blocksize = 512, encode_len = 1024, new_len = 0; + switch_size_t llen = 0, dlen = 0, blocksize = 512, encode_len = 1536, new_len = 0; char *buf; char *encode_buf = NULL; /* used for url encoding of variables to make sure unsafe things stay out of the serialzed copy */ @@ -650,7 +650,7 @@ /* handle any bad things in the string like newlines : etc that screw up the serialized format */ switch_url_encode(hp->value, encode_buf, encode_len - 1); - llen = strlen(hp->name) + strlen(encode_buf) + 2; + llen = strlen(hp->name) + strlen(encode_buf) + 8; if ((len + llen) > dlen) { char *m;

1 0

[commit] r3673 - freeswitch/trunk/src/mod/codecs/mod_ilbc
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Fri Dec 15 12:41:56 2006 New Revision: 3673 Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile Log: make ilbc static Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile Fri Dec 15 12:41:56 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX) --disable-shared $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

1 0

[commit] r3672 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: mikej Date: Fri Dec 15 12:25:17 2006 New Revision: 3672 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: typo Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Dec 15 12:25:17 2006 @@ -137,15 +137,15 @@ NODE_TYPE_SPEECH } node_type_t; -typedef struct confernce_file_node { +typedef struct conference_file_node { switch_file_handle_t fh; switch_speech_handle_t sh; node_type_t type; uint8_t done; switch_memory_pool_t *pool; uint32_t leadin; - struct confernce_file_node *next; -} confernce_file_node_t; + struct conference_file_node *next; +} conference_file_node_t; /* Conference Object */ typedef struct conference_obj { @@ -178,7 +178,7 @@ switch_mutex_t *mutex; conference_member_t *members; switch_mutex_t *member_mutex; - confernce_file_node_t *fnode; + conference_file_node_t *fnode; switch_memory_pool_t *pool; switch_thread_rwlock_t *rwlock; uint32_t count; @@ -221,7 +221,7 @@ uint32_t native_rate; switch_audio_resampler_t *mux_resampler; switch_audio_resampler_t *read_resampler; - confernce_file_node_t *fnode; + conference_file_node_t *fnode; conference_relationship_t *relationships; struct conference_member *next; }; @@ -488,7 +488,7 @@ if (member->fnode) { /* Close Unused Handles */ - confernce_file_node_t *fnode, *cur; + conference_file_node_t *fnode, *cur; switch_memory_pool_t *pool; fnode = member->fnode; @@ -726,7 +726,7 @@ } if (conference->fnode && conference->fnode->done) { - confernce_file_node_t *fnode; + conference_file_node_t *fnode; switch_memory_pool_t *pool; if (conference->fnode->type == NODE_TYPE_SPEECH) { @@ -769,7 +769,7 @@ switch_mutex_lock(conference->mutex); if (conference->fnode) { /* Close Unused Handles */ - confernce_file_node_t *fnode, *cur; + conference_file_node_t *fnode, *cur; switch_memory_pool_t *pool; fnode = conference->fnode; @@ -1168,7 +1168,7 @@ if (member->fnode) { /* if we are done, clean it up */ if (member->fnode->done) { - confernce_file_node_t *fnode; + conference_file_node_t *fnode; switch_memory_pool_t *pool; if (member->fnode->type == NODE_TYPE_SPEECH) { @@ -1392,7 +1392,7 @@ /* Make files stop playing in a conference either the current one or all of them */ static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop) { - confernce_file_node_t *nptr; + conference_file_node_t *nptr; uint32_t count = 0; switch_mutex_lock(conference->mutex); @@ -1417,7 +1417,7 @@ /* stop playing a file for the member of the conference */ static uint32_t conference_member_stop_file(conference_member_t *member, file_stop_t stop) { - confernce_file_node_t *nptr; + conference_file_node_t *nptr; uint32_t count = 0; switch_mutex_lock(member->flag_mutex); @@ -1442,7 +1442,7 @@ /* Play a file in the conference room */ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel) { - confernce_file_node_t *fnode, *nptr; + conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; uint32_t count; char *expanded = NULL; @@ -1529,7 +1529,7 @@ /* Play a file in the conference room to a member */ static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin) { - confernce_file_node_t *fnode, *nptr; + conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; if (*file != '/') { @@ -1581,7 +1581,7 @@ /* Say some thing with TTS in the conference room */ static switch_status_t conference_member_say(conference_obj_t *conference, conference_member_t *member, char *text, uint32_t leadin) { - confernce_file_node_t *fnode, *nptr; + conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; @@ -1640,7 +1640,7 @@ /* Say some thing with TTS in the conference room */ static switch_status_t conference_say(conference_obj_t *conference, char *text, uint32_t leadin) { - confernce_file_node_t *fnode, *nptr; + conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; uint32_t count;

1 0

[commit] r3671 - in freeswitch/trunk/src/mod/codecs: mod_g723_1 mod_g729
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Fri Dec 15 12:24:42 2006 New Revision: 3671 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Log: fix makefiles Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Fri Dec 15 12:24:42 2006 @@ -1,7 +1,7 @@ -ifeq ($(shell ls $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) +ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) -CFLAGS += -I$(PREFIX)/include/g723 -LDFLAGS +=-lg723 +CFLAGS += -I$(PREFIX)/include/libg723_1 +LDFLAGS +=-lg723_1 else Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Fri Dec 15 12:24:42 2006 @@ -34,7 +34,7 @@ #include "switch.h" #ifndef G723_PASSTHROUGH -#include "g723.h" +#include "g723_1.h" #define TYPE_HIGH 0x0 #define TYPE_LOW 0x1 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Fri Dec 15 12:24:42 2006 @@ -1,6 +1,6 @@ -ifeq ($(shell ls $(BASE)/libs/libg729),$(BASE)/libs/libg729) +ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729) -CFLAGS += -I$(PREFIX)/include/g729 +CFLAGS += -I$(PREFIX)/include/libg729 LDFLAGS +=-lg729 else @@ -12,7 +12,6 @@ all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

1 0

[commit] r3670 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Fri Dec 15 12:01:01 2006 New Revision: 3670 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: avoid potential div by zero Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Dec 15 12:01:01 2006 @@ -3256,14 +3256,15 @@ int16_t *data; data = read_frame->data; - samples = read_frame->datalen / sizeof(*data); + if ((samples = read_frame->datalen / sizeof(*data))) { - for (i = 0; i < samples; i++) { - energy += abs(data[j]); - j += read_codec->implementation->number_of_channels; - } + for (i = 0; i < samples; i++) { + energy += abs(data[j]); + j += read_codec->implementation->number_of_channels; + } - score = energy / samples; + score = energy / samples; + } if (score > energy_level) { uint32_t diff = score - energy_level;

1 0

[commit] r3669 - freeswitch/trunk/src
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: mikej Date: Fri Dec 15 10:33:43 2006 New Revision: 3669 Modified: freeswitch/trunk/src/switch_rtp.c Log: solaris build tweak. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Dec 15 10:33:43 2006 @@ -38,6 +38,7 @@ #undef PACKAGE_BUGREPORT #undef VERSION #undef PACKAGE +#undef inline #include <datatypes.h> #include <srtp.h> @@ -219,7 +220,7 @@ elapsed = (unsigned int)((switch_time_now() - rtp_session->last_stun) / 1000); if (elapsed > 30000) { - switch_log_printf(SWITCH_CHANNEL_LOG, 3, "No stun for a long time (PUNT!)\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s", "No stun for a long time (PUNT!)\n"); return SWITCH_STATUS_FALSE; } }

1 0

[commit] r3668 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: anthm Date: Thu Dec 14 22:07:44 2006 New Revision: 3668 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 14 22:07:44 2006 @@ -475,7 +475,7 @@ switch_mutex_lock(member->flag_mutex); for (imember = conference->members; imember; imember = imember->next) { - if (imember == member ) { + if (imember == member) { if (last) { last->next = imember->next; } else { @@ -487,6 +487,29 @@ } + if (member->fnode) { /* Close Unused Handles */ + confernce_file_node_t *fnode, *cur; + switch_memory_pool_t *pool; + + fnode = member->fnode; + while(fnode) { + cur = fnode; + fnode = fnode->next; + + if (cur->type == NODE_TYPE_SPEECH) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_speech_close(&cur->sh, &flags); + } else { + switch_core_file_close(&cur->fh); + } + + pool = cur->pool; + switch_core_destroy_memory_pool(&pool); + } + + member->fnode = NULL; + } + member->conference = NULL; if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { @@ -745,6 +768,28 @@ switch_mutex_lock(conference->mutex); + if (conference->fnode) { /* Close Unused Handles */ + confernce_file_node_t *fnode, *cur; + switch_memory_pool_t *pool; + + fnode = conference->fnode; + while (fnode) { + cur = fnode; + fnode = fnode->next; + + if (cur->type == NODE_TYPE_SPEECH) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_speech_close(&cur->sh, &flags); + } else { + switch_core_file_close(&cur->fh); + } + + pool = cur->pool; + switch_core_destroy_memory_pool(&pool); + } + conference->fnode = NULL; + } + for(imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel; @@ -1583,11 +1628,11 @@ } else { member->fnode = fnode; } - switch_mutex_unlock(member->flag_mutex); /* Begin Generation */ switch_sleep(200000); switch_core_speech_feed_tts(&fnode->sh, text, &flags); + switch_mutex_unlock(member->flag_mutex); return SWITCH_STATUS_SUCCESS; } @@ -1651,11 +1696,11 @@ } else { conference->fnode = fnode; } - switch_mutex_unlock(conference->mutex); /* Begin Generation */ switch_sleep(200000); switch_core_speech_feed_tts(&fnode->sh, text, &flags); + switch_mutex_unlock(conference->mutex); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3667 - freeswitch/branches/johnc
by Freeswitch SVN 15 Dec '06

15 Dec '06

Author: sphere Date: Thu Dec 14 21:12:38 2006 New Revision: 3667 Added: freeswitch/branches/johnc/ Log: Creating empty folder for johnc

1 0

[commit] r3666 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Dec '06

14 Dec '06

Author: anthm Date: Thu Dec 14 18:01:07 2006 New Revision: 3666 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 14 18:01:07 2006 @@ -1714,8 +1714,13 @@ count++; } - stream->write_function(stream, "\n"); - } + stream->write_function(stream, "%s%d%s%d%s%d\n", + delim, + member->volume_in_level, delim, + member->volume_out_level, delim, + member->energy_level); + } + switch_mutex_unlock(conference->member_mutex); }

1 0