- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8276 - in freeswitch/trunk/src: . include
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 16:00:43 2008 New Revision: 8276 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_core_sqldb.c Log: add dialplan and context to sql table Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue May 6 16:00:43 2008 @@ -158,6 +158,8 @@ */ _Ret_opt_z_ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name); +#define switch_event_get_header_nil(e, h) switch_str_nil(switch_event_get_header(e,h)) + /*! \brief Retrieve the body value from an event \param event the event to read the body from Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Tue May 6 16:00:43 2008 @@ -202,7 +202,7 @@ if (trans && ((itterations == target) || nothing_in_queue)) { - if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 1000) != SWITCH_STATUS_SUCCESS) { + if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 100) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n"); } itterations = 0; @@ -237,50 +237,53 @@ switch (event->event_id) { case SWITCH_EVENT_ADD_SCHEDULE: sql = switch_mprintf("insert into tasks values('%q','%q','%q','%q')", - switch_event_get_header(event, "task-id"), - switch_event_get_header(event, "task-desc"), - switch_event_get_header(event, "task-group"), switch_event_get_header(event, "task-sql_manager") - ); + switch_event_get_header_nil(event, "task-id"), + switch_event_get_header_nil(event, "task-desc"), + switch_event_get_header_nil(event, "task-group"), + switch_event_get_header_nil(event, "task-sql_manager") + ); break; case SWITCH_EVENT_DEL_SCHEDULE: case SWITCH_EVENT_EXE_SCHEDULE: - sql = switch_mprintf("delete from tasks where task_id=%q", switch_event_get_header(event, "task-id")); + sql = switch_mprintf("delete from tasks where task_id=%q", switch_event_get_header_nil(event, "task-id")); break; case SWITCH_EVENT_RE_SCHEDULE: sql = switch_mprintf("update tasks set task_sql_manager='%q' where task_id=%q", - switch_event_get_header(event, "task-sql_manager"), switch_event_get_header(event, "task-id")); + switch_event_get_header_nil(event, "task-sql_manager"), switch_event_get_header_nil(event, "task-id")); break; case SWITCH_EVENT_CHANNEL_DESTROY: - sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header(event, "unique-id")); + sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header_nil(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_CREATE: - sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state) values('%q','%q','%ld','%q','%q')", - switch_event_get_header(event, "unique-id"), - switch_event_get_header(event, "event-date-local"), + sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state,dialplan,context) values('%q','%q','%ld','%q','%q','%q','%q')", + switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "event-date-local"), (long)switch_timestamp(NULL), - switch_event_get_header(event, "channel-name"), - switch_event_get_header(event, "channel-state") + switch_event_get_header_nil(event, "channel-name"), + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context") ); break; case SWITCH_EVENT_CODEC: sql = switch_mprintf ("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", - switch_event_get_header(event, "channel-read-codec-name"), switch_event_get_header(event, + switch_event_get_header_nil(event, "channel-read-codec-name"), switch_event_get_header_nil(event, "channel-read-codec-rate"), - switch_event_get_header(event, "channel-write-codec-name"), switch_event_get_header(event, + switch_event_get_header_nil(event, "channel-write-codec-name"), switch_event_get_header_nil(event, "channel-write-codec-rate"), - switch_event_get_header(event, "unique-id")); + switch_event_get_header_nil(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_EXECUTE: sql = switch_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", - switch_event_get_header(event, "application"), - switch_event_get_header(event, "application-data"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "application"), + switch_event_get_header_nil(event, "application-data"), switch_event_get_header_nil(event, "unique-id") ); break; case SWITCH_EVENT_CHANNEL_STATE: if (event) { - char *state = switch_event_get_header(event, "channel-state-number"); + char *state = switch_event_get_header_nil(event, "channel-state-number"); switch_channel_state_t state_i = atoi(state); switch (state_i) { @@ -288,18 +291,21 @@ case CS_DONE: break; case CS_ROUTING: - sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q' " + sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q',dialplan='%q',context='%q' " "where uuid='%s'", - switch_event_get_header(event, "channel-state"), - switch_event_get_header(event, "caller-caller-id-name"), - switch_event_get_header(event, "caller-caller-id-number"), - switch_event_get_header(event, "caller-network-addr"), - switch_event_get_header(event, "caller-destination-number"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-network-addr"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context"), + switch_event_get_header_nil(event, "unique-id") ); break; default: sql = switch_mprintf("update channels set state='%s' where uuid='%s'", - switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "channel-state"), switch_event_get_header_nil(event, "unique-id") ); break; } @@ -308,22 +314,22 @@ break; case SWITCH_EVENT_CHANNEL_BRIDGE: sql = switch_mprintf("insert into calls values ('%s', '%ld', '%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", - switch_event_get_header(event, "event-date-local"), + switch_event_get_header_nil(event, "event-date-local"), (long)switch_timestamp(NULL), - switch_event_get_header(event, "event-calling-function"), - switch_event_get_header(event, "caller-caller-id-name"), - switch_event_get_header(event, "caller-caller-id-number"), - switch_event_get_header(event, "caller-destination-number"), - switch_event_get_header(event, "caller-channel-name"), - switch_event_get_header(event, "caller-unique-id"), - switch_event_get_header(event, "Other-Leg-caller-id-name"), - switch_event_get_header(event, "Other-Leg-caller-id-number"), - switch_event_get_header(event, "Other-Leg-destination-number"), - switch_event_get_header(event, "Other-Leg-channel-name"), switch_event_get_header(event, "Other-Leg-unique-id") + switch_event_get_header_nil(event, "event-calling-function"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-channel-name"), + switch_event_get_header_nil(event, "caller-unique-id"), + switch_event_get_header_nil(event, "Other-Leg-caller-id-name"), + switch_event_get_header_nil(event, "Other-Leg-caller-id-number"), + switch_event_get_header_nil(event, "Other-Leg-destination-number"), + switch_event_get_header_nil(event, "Other-Leg-channel-name"), switch_event_get_header_nil(event, "Other-Leg-unique-id") ); break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); + sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header_nil(event, "caller-unique-id")); break; case SWITCH_EVENT_SHUTDOWN: sql = switch_mprintf("delete from channels;delete from interfaces;delete from calls"); @@ -332,10 +338,10 @@ return; case SWITCH_EVENT_MODULE_LOAD: { - const char *type = switch_event_get_header(event, "type"); - const char *name = switch_event_get_header(event, "name"); - const char *description = switch_event_get_header(event, "description"); - const char *syntax = switch_event_get_header(event, "syntax"); + const char *type = switch_event_get_header_nil(event, "type"); + const char *name = switch_event_get_header_nil(event, "name"); + const char *description = switch_event_get_header_nil(event, "description"); + const char *syntax = switch_event_get_header_nil(event, "syntax"); if (!switch_strlen_zero(type) && !switch_strlen_zero(name)) { sql = switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", @@ -401,6 +407,8 @@ " dest VARCHAR(255),\n" " application VARCHAR(255),\n" " application_data VARCHAR(255),\n" + " dialplan VARCHAR(255),\n" + " context VARCHAR(255),\n" " read_codec VARCHAR(255),\n" " read_rate VARCHAR(255),\n" " write_codec VARCHAR(255),\n"

1 0

[commit] r8275 - in freeswitch/trunk/conf/sip_profiles: default nat outbound
by Freeswitch SVN 06 May '08

06 May '08

Author: brian Date: Tue May 6 12:08:04 2008 New Revision: 8275 Modified: freeswitch/trunk/conf/sip_profiles/default/example.xml freeswitch/trunk/conf/sip_profiles/nat/example.xml freeswitch/trunk/conf/sip_profiles/outbound/example.xml Log: clarify Modified: freeswitch/trunk/conf/sip_profiles/default/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -     Modified: freeswitch/trunk/conf/sip_profiles/nat/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -     Modified: freeswitch/trunk/conf/sip_profiles/outbound/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -

1 0

[commit] r8274 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 06 May '08

06 May '08

Author: mikej Date: Tue May 6 12:06:17 2008 New Revision: 8274 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Log: whoops Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Tue May 6 12:06:17 2008 @@ -43,7 +43,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" - EnablePREfast="true" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r8273 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by Freeswitch SVN 06 May '08

06 May '08

Author: stkn Date: Tue May 6 12:03:02 2008 New Revision: 8273 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Log: mod_xml_ldap: strip -std=c99 from CFLAGS during openldap build (fixes problems w/ arpa/nameser.h on linux) and stop building openldap server components Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Tue May 6 12:03:02 2008 @@ -8,7 +8,8 @@ LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic +DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd +DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) @@ -16,7 +17,7 @@ $(LDAP_DIR): $(GETLIB) $(LDAP).tgz - cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb --disable-slapd + cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) cd $(LDAP_DIR) && $(MAKE)

1 0

[commit] r8272 - freeswitch/trunk/scripts/contrib/jpalley
by Freeswitch SVN 06 May '08

06 May '08

Author: brian Date: Tue May 6 11:47:45 2008 New Revision: 8272 Added: freeswitch/trunk/scripts/contrib/jpalley/ Log: welcome to the jungle

1 0

[commit] r8271 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 06 May '08

06 May '08

Author: mikej Date: Tue May 6 11:46:11 2008 New Revision: 8271 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Log: tweak Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Tue May 6 11:46:11 2008 @@ -43,7 +43,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" - EnablePREfast="false" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r8270 - in freeswitch/trunk/src/mod/endpoints: mod_alsa mod_dingaling mod_iax mod_portaudio mod_reference mod_sofia mod_wanpipe mod_woomera
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 09:59:37 2008 New Revision: 8270 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: missed some name changes thanks coppice Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Tue May 6 09:59:37 2008 @@ -293,7 +293,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue May 6 09:59:37 2008 @@ -1165,7 +1165,7 @@ switch_set_flag(tech_pvt, TFLAG_READY); if (negotiate_media(session) == SWITCH_STATUS_SUCCESS) { - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue May 6 09:59:37 2008 @@ -467,7 +467,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(switch_core_session_get_channel(session), CS_ROUTING); switch_mutex_lock(globals.mutex); globals.calls++; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue May 6 09:59:37 2008 @@ -283,7 +283,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Tue May 6 09:59:37 2008 @@ -139,7 +139,10 @@ assert(channel != NULL); switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING. This means the call is trying + to get from the initial start where the call because, to the point + where a destination has been identified. If the channel is simply + left in the initial state, nothing will happen. */ switch_channel_set_state(channel, CS_ROUTING); switch_mutex_lock(globals.mutex); globals.calls++; 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 Tue May 6 09:59:37 2008 @@ -103,7 +103,7 @@ } } - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); assert( switch_channel_get_state(channel) != CS_INIT); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Tue May 6 09:59:37 2008 @@ -613,7 +613,7 @@ done: - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Tue May 6 09:59:37 2008 @@ -1042,7 +1042,7 @@ ptr++; port = (switch_port_t) atoi(ptr); } - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_answer(channel); switch_channel_set_state(channel, CS_ROUTING);

1 0

[commit] r8269 - freeswitch/trunk/src
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 09:58:36 2008 New Revision: 8269 Modified: freeswitch/trunk/src/switch_time.c Log: crank accuracy on windows sleep Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue May 6 09:58:36 2008 @@ -173,6 +173,9 @@ } if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { +#if defined(WIN32) + timeBeginPeriod(1); +#endif switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count++; switch_mutex_unlock(globals.mutex); @@ -454,6 +457,12 @@ switch_yield(10000); } } + +#if defined(WIN32) + timeEndPeriod(1); +#endif + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8268 - freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket
by Freeswitch SVN 06 May '08

06 May '08

Author: verifier Date: Tue May 6 05:08:08 2008 New Revision: 8268 Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Log: Added a missing comma. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Tue May 6 05:08:08 2008 @@ -6,7 +6,7 @@ New, // Channel is newly created Init, // Channel has been initilized Routing, // Channel is looking for a dialplan - SoftExecute // Channel is in a passive transmit state + SoftExecute, // Channel is in a passive transmit state Execute, // Channel is executing it's dialplan ExchangeMedia, // Channel is exchanging media ConsumeMedia, // Channel is consuming media

1 0

[commit] r8267 - freeswitch/trunk/src
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Mon May 5 20:02:37 2008 New Revision: 8267 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix vid issue Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon May 5 20:02:37 2008 @@ -1276,12 +1276,14 @@ for (imp = codec_interface->implementations; imp; imp = imp->next) { uint8_t match = 1; - if ((uint32_t) (imp->microseconds_per_frame / 1000) != 20) { - match = 0; - } - - if (match && rate && (uint32_t) imp->samples_per_second != rate) { - match = 0; + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + if ((uint32_t) (imp->microseconds_per_frame / 1000) != 20) { + match = 0; + } + + if (match && rate && (uint32_t) imp->samples_per_second != rate) { + match = 0; + } } if (match) { @@ -1295,12 +1297,14 @@ for (imp = codec_interface->implementations; imp; imp = imp->next) { uint8_t match = 1; - if (interval && (uint32_t) (imp->microseconds_per_frame / 1000) != interval) { - match = 0; - } + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + if (interval && (uint32_t) (imp->microseconds_per_frame / 1000) != interval) { + match = 0; + } - if (match && rate && (uint32_t) imp->samples_per_second != rate) { - match = 0; + if (match && rate && (uint32_t) imp->samples_per_second != rate) { + match = 0; + } } if (match) {

1 0