- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11145 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: anthm Date: Mon Jan 12 13:12:09 2009 New Revision: 11145 Log: adjust buffering sizes to allow resampling of high defination audio codecs so they can be transcoded to lower and higher levels Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 12 13:12:09 2009 @@ -204,11 +204,12 @@ if (fh->resampler->to_len < want || fh->resampler->to_len > orig_len) { if (!fh->buffer) { - switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 4, fh->resampler->to_len * 8, fh->resampler->to_len * 32); + int factor = fh->resampler->to_len * fh->samplerate / 1000; + switch_buffer_create_dynamic(&fh->buffer, factor, factor, 0); switch_assert(fh->buffer); } if (!fh->dbuf) { - fh->dbuflen = fh->resampler->to_len * 10; + fh->dbuflen = want * 2; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen); @@ -217,7 +218,7 @@ switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); if (switch_buffer_inuse(fh->buffer) < want * 2) { - *len = want - fh->resampler->to_len; + *len = want; goto more; } *len = switch_buffer_read(fh->buffer, data, orig_len * 2) / 2;

1 0

[commit] r11143 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: anthm Date: Mon Jan 12 12:37:44 2009 New Revision: 11143 Log: cache read_codec implementation to reduce risk of race conditions Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mon Jan 12 12:37:44 2009 @@ -709,14 +709,14 @@ } if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { - if (!tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { + if (!tech_pvt->read_impl.encoded_bytes_per_packet) { tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; goto skip; } - if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { + if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_impl.encoded_bytes_per_packet) { switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - - tech_pvt->last_ts) / (tech_pvt->read_codec.implementation->samples_per_second / 1000); + tech_pvt->last_ts) / (tech_pvt->read_impl.samples_per_second / 1000); if ((codec_ms % 10) != 0) { tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; @@ -768,8 +768,8 @@ } if (rtp_timeout_sec) { - tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; + tech_pvt->max_missed_packets = (tech_pvt->read_impl.samples_per_second * rtp_timeout_sec) / + tech_pvt->read_impl.samples_per_packet; switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); if (!rtp_hold_timeout_sec) { @@ -778,13 +778,13 @@ } if (rtp_hold_timeout_sec) { - tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; + tech_pvt->max_missed_hold_packets = (tech_pvt->read_impl.samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_impl.samples_per_packet; } if (switch_rtp_change_interval(tech_pvt->rtp_session, tech_pvt->codec_ms * 1000, - tech_pvt->read_codec.implementation->samples_per_packet + tech_pvt->read_impl.samples_per_packet ) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -806,10 +806,10 @@ } skip: - if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet)) { + if ((bytes = tech_pvt->read_impl.encoded_bytes_per_packet)) { frames = (tech_pvt->read_frame.datalen / bytes); } - tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_packet); + tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_impl.samples_per_packet); if (tech_pvt->read_frame.datalen == 0) { continue; @@ -872,13 +872,13 @@ switch_set_flag_locked(tech_pvt, TFLAG_WRITING); if (!switch_test_flag(frame, SFF_CNG) && !switch_test_flag(frame, SFF_PROXY_PACKET)) { - if (tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet; + if (tech_pvt->read_impl.encoded_bytes_per_packet) { + bytes = tech_pvt->read_impl.encoded_bytes_per_packet; frames = ((int) frame->datalen / bytes); } else frames = 1; - samples = frames * tech_pvt->read_codec.implementation->samples_per_packet; + samples = frames * tech_pvt->read_impl.samples_per_packet; } tech_pvt->timestamp_send += samples; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Jan 12 12:37:44 2009 @@ -553,6 +553,8 @@ uint32_t last_codec_ms; nua_event_t want_event; switch_rtp_bug_flag_t rtp_bugs; + switch_codec_implementation_t read_impl; + switch_codec_implementation_t write_impl; }; struct callback_t { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Jan 12 12:37:44 2009 @@ -1654,9 +1654,13 @@ switch_goto_status(SWITCH_STATUS_FALSE, end); } + tech_pvt->read_impl = *tech_pvt->read_codec.implementation; + tech_pvt->write_impl = *tech_pvt->write_codec.implementation; + + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_assert(tech_pvt->read_codec.implementation); - switch_rtp_set_default_samples_per_interval(tech_pvt->rtp_session, tech_pvt->read_codec.implementation->samples_per_packet); + switch_rtp_set_default_samples_per_interval(tech_pvt->rtp_session, tech_pvt->read_impl.samples_per_packet); } tech_pvt->read_frame.rate = tech_pvt->rm_rate; @@ -1669,7 +1673,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->iananame, tech_pvt->rm_rate, tech_pvt->codec_ms, - tech_pvt->read_codec.implementation->samples_per_packet); + tech_pvt->read_impl.samples_per_packet); tech_pvt->read_frame.codec = &tech_pvt->read_codec; tech_pvt->write_codec.agreed_pt = tech_pvt->agreed_pt; @@ -1832,8 +1836,8 @@ goto end; } - bw = tech_pvt->read_codec.implementation->bits_per_second; - ms = tech_pvt->read_codec.implementation->microseconds_per_packet; + bw = tech_pvt->read_impl.bits_per_second; + ms = tech_pvt->read_impl.microseconds_per_packet; if (myflags) { flags = myflags; @@ -1892,7 +1896,7 @@ tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_audio_port, tech_pvt->remote_sdp_audio_ip, - tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->microseconds_per_packet / 1000); + tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, tech_pvt->read_impl.microseconds_per_packet / 1000); } switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->local_sdp_audio_port); @@ -1934,7 +1938,7 @@ tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_audio_port, tech_pvt->remote_sdp_audio_ip, - tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->microseconds_per_packet / 1000); + tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, tech_pvt->read_impl.microseconds_per_packet / 1000); } else { timer_name = tech_pvt->profile->timer_name; @@ -1949,7 +1953,7 @@ tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, - tech_pvt->read_codec.implementation->samples_per_packet, + tech_pvt->read_impl.samples_per_packet, tech_pvt->codec_ms * 1000, (switch_rtp_flag_t) flags, timer_name, &err, switch_core_session_get_pool(tech_pvt->session)); @@ -1982,7 +1986,7 @@ } } - stun_ping = (ival * tech_pvt->read_codec.implementation->samples_per_second) / tech_pvt->read_codec.implementation->samples_per_packet; + stun_ping = (ival * tech_pvt->read_impl.samples_per_second) / tech_pvt->read_impl.samples_per_packet; } tech_pvt->ssrc = switch_rtp_get_ssrc(tech_pvt->rtp_session); @@ -2012,7 +2016,7 @@ } else { int qlen; - qlen = len / (tech_pvt->read_codec.implementation->microseconds_per_packet / 1000); + qlen = len / (tech_pvt->read_impl.microseconds_per_packet / 1000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting Jitterbuffer to %dms (%d frames)\n", len, qlen); switch_rtp_activate_jitter_buffer(tech_pvt->rtp_session, qlen); @@ -2034,8 +2038,8 @@ } if (rtp_timeout_sec) { - tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; + tech_pvt->max_missed_packets = (tech_pvt->read_impl.samples_per_second * rtp_timeout_sec) / + tech_pvt->read_impl.samples_per_packet; switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); if (!rtp_hold_timeout_sec) { @@ -2044,8 +2048,8 @@ } if (rtp_hold_timeout_sec) { - tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; + tech_pvt->max_missed_hold_packets = (tech_pvt->read_impl.samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_impl.samples_per_packet; } if (tech_pvt->te) {

1 0

[commit] r11137 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: anthm Date: Mon Jan 12 11:12:09 2009 New Revision: 11137 Log: fix regression from change last week Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Jan 12 11:12:09 2009 @@ -805,7 +805,8 @@ } if (session->write_codec) { - if (write_frame->codec->implementation->decoded_bytes_per_packet == session->write_codec->implementation->decoded_bytes_per_packet) { + if (!ptime_mismatch && + write_frame->codec->implementation->decoded_bytes_per_packet == session->write_codec->implementation->decoded_bytes_per_packet) { perfect = TRUE; } else { if (!session->raw_write_buffer) {

1 0

[commit] r11132 - freeswitch/trunk/scripts/contrib/mrene/mod_limit
by FreeSWITCH SVN 11 Jan '09

11 Jan '09

Author: mrene Date: Sun Jan 11 15:41:56 2009 New Revision: 11132 Log: Cleanup Removed: freeswitch/trunk/scripts/contrib/mrene/mod_limit/

1 0

[commit] r11113 - freeswitch/trunk/src
by FreeSWITCH SVN 10 Jan '09

10 Jan '09

Author: anthm Date: Sat Jan 10 10:04:34 2009 New Revision: 11113 Log: tweak Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Jan 10 10:04:34 2009 @@ -431,6 +431,10 @@ return SWITCH_STATUS_GENERR; } + if (switch_test_flag(fh, SWITCH_FILE_NATIVE)) { + asis = 1; + } + switch_channel_pre_answer(channel); if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) {

1 0

[commit] r11112 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 10 Jan '09

10 Jan '09

Author: brian Date: Sat Jan 10 10:01:02 2009 New Revision: 11112 Log: reswig Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Sat Jan 10 10:01:02 2009 @@ -1510,6 +1510,17 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get() { + int jresult ; + int result; + + result = (int) 65536; + + jresult = result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) { switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ; char arg2 ; @@ -6143,13 +6154,15 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reset(void * jarg1, int jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reset(void * jarg1, int jarg2, int jarg3) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_bool_t arg2 ; + switch_bool_t arg3 ; arg1 = (switch_core_session_t *)jarg1; arg2 = (switch_bool_t)jarg2; - switch_core_session_reset(arg1,arg2); + arg3 = (switch_bool_t)jarg3; + switch_core_session_reset(arg1,arg2,arg3); } @@ -13093,6 +13106,81 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_buffer_t *arg2 = (switch_buffer_t *) 0 ; + + arg1 = (switch_file_handle *)jarg1; + arg2 = (switch_buffer_t *)jarg2; + if (arg1) (arg1)->pre_buffer = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_buffer_t *result = 0 ; + + arg1 = (switch_file_handle *)jarg1; + result = (switch_buffer_t *) ((arg1)->pre_buffer); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + unsigned char *arg2 = (unsigned char *) 0 ; + + arg1 = (switch_file_handle *)jarg1; + arg2 = (unsigned char *)jarg2; + if (arg1) (arg1)->pre_buffer_data = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + unsigned char *result = 0 ; + + arg1 = (switch_file_handle *)jarg1; + result = (unsigned char *) ((arg1)->pre_buffer_data); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_file_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->pre_buffer_datalen = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_file_handle *)jarg1; + result = ((arg1)->pre_buffer_datalen); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_set(void * jarg1, char * jarg2) { switch_file_handle *arg1 = (switch_file_handle *) 0 ; char *arg2 = (char *) 0 ; @@ -18377,6 +18465,26 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_basic_data(void * jarg1, void * jarg2) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_event_t *arg2 = (switch_event_t *) 0 ; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (switch_event_t *)jarg2; + switch_channel_event_set_basic_data(arg1,arg2); +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_extended_data(void * jarg1, void * jarg2) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_event_t *arg2 = (switch_event_t *) 0 ; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (switch_event_t *)jarg2; + switch_channel_event_set_extended_data(arg1,arg2); +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_expand_variables(void * jarg1, char * jarg2) { char * jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Sat Jan 10 10:01:02 2009 @@ -1344,8 +1344,8 @@ return ret; } - public static void switch_core_session_reset(SWIGTYPE_p_switch_core_session session, switch_bool_t flush_dtmf) { - freeswitchPINVOKE.switch_core_session_reset(SWIGTYPE_p_switch_core_session.getCPtr(session), (int)flush_dtmf); + public static void switch_core_session_reset(SWIGTYPE_p_switch_core_session session, switch_bool_t flush_dtmf, switch_bool_t reset_read_codec) { + freeswitchPINVOKE.switch_core_session_reset(SWIGTYPE_p_switch_core_session.getCPtr(session), (int)flush_dtmf, (int)reset_read_codec); } public static switch_status_t switch_core_session_write_frame(SWIGTYPE_p_switch_core_session session, switch_frame frame, uint flags, int stream_id) { @@ -2581,6 +2581,14 @@ freeswitchPINVOKE.switch_channel_event_set_data(SWIGTYPE_p_switch_channel.getCPtr(channel), switch_event.getCPtr(arg1)); } + public static void switch_channel_event_set_basic_data(SWIGTYPE_p_switch_channel channel, switch_event arg1) { + freeswitchPINVOKE.switch_channel_event_set_basic_data(SWIGTYPE_p_switch_channel.getCPtr(channel), switch_event.getCPtr(arg1)); + } + + public static void switch_channel_event_set_extended_data(SWIGTYPE_p_switch_channel channel, switch_event arg1) { + freeswitchPINVOKE.switch_channel_event_set_extended_data(SWIGTYPE_p_switch_channel.getCPtr(channel), switch_event.getCPtr(arg1)); + } + public static string switch_channel_expand_variables(SWIGTYPE_p_switch_channel channel, string arg1) { string ret = freeswitchPINVOKE.switch_channel_expand_variables(SWIGTYPE_p_switch_channel.getCPtr(channel), arg1); return ret; @@ -4109,6 +4117,7 @@ public static readonly string SWITCH_SPEECH_KEY = freeswitchPINVOKE.SWITCH_SPEECH_KEY_get(); public static readonly string SWITCH_UUID_BRIDGE = freeswitchPINVOKE.SWITCH_UUID_BRIDGE_get(); public static readonly int SWITCH_BITS_PER_BYTE = freeswitchPINVOKE.SWITCH_BITS_PER_BYTE_get(); + public static readonly int SWITCH_DEFAULT_FILE_BUFFER_LEN = freeswitchPINVOKE.SWITCH_DEFAULT_FILE_BUFFER_LEN_get(); public static readonly int SWITCH_MAX_STACKS = freeswitchPINVOKE.SWITCH_MAX_STACKS_get(); public static readonly int SWITCH_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_THREAD_STACKSIZE_get(); public static readonly int SWITCH_SYSTEM_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_SYSTEM_THREAD_STACKSIZE_get(); @@ -4690,6 +4699,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_BITS_PER_BYTE_get")] public static extern int SWITCH_BITS_PER_BYTE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get")] + public static extern int SWITCH_DEFAULT_FILE_BUFFER_LEN_get(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_dtmf_t_digit_set")] public static extern void switch_dtmf_t_digit_set(HandleRef jarg1, char jarg2); @@ -5798,7 +5810,7 @@ public static extern int switch_core_session_write_video_frame(HandleRef jarg1, HandleRef jarg2, uint jarg3, int jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_reset")] - public static extern void switch_core_session_reset(HandleRef jarg1, int jarg2); + public static extern void switch_core_session_reset(HandleRef jarg1, int jarg2, int jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_write_frame")] public static extern int switch_core_session_write_frame(HandleRef jarg1, HandleRef jarg2, uint jarg3, int jarg4); @@ -7438,6 +7450,24 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_dbuflen_get")] public static extern IntPtr switch_file_handle_dbuflen_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_set")] + public static extern void switch_file_handle_pre_buffer_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_get")] + public static extern IntPtr switch_file_handle_pre_buffer_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_data_set")] + public static extern void switch_file_handle_pre_buffer_data_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_data_get")] + public static extern IntPtr switch_file_handle_pre_buffer_data_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_datalen_set")] + public static extern void switch_file_handle_pre_buffer_datalen_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_pre_buffer_datalen_get")] + public static extern IntPtr switch_file_handle_pre_buffer_datalen_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_file_set")] public static extern void switch_file_handle_file_set(HandleRef jarg1, string jarg2); @@ -8743,6 +8773,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_event_set_data")] public static extern void switch_channel_event_set_data(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_event_set_basic_data")] + public static extern void switch_channel_event_set_basic_data(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_event_set_extended_data")] + public static extern void switch_channel_event_set_extended_data(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_expand_variables")] public static extern string switch_channel_expand_variables(HandleRef jarg1, string jarg2); @@ -19956,7 +19992,9 @@ SWITCH_FILE_NATIVE = (1 << 9), SWITCH_FILE_SEEK = (1 << 10), SWITCH_FILE_OPEN = (1 << 11), - SWITCH_FILE_CALLBACK = (1 << 12) + SWITCH_FILE_CALLBACK = (1 << 12), + SWITCH_FILE_DONE = (1 << 13), + SWITCH_FILE_BUFFER_DONE = (1 << 14) } } @@ -20304,6 +20342,40 @@ } } + public SWIGTYPE_p_switch_buffer pre_buffer { + set { + freeswitchPINVOKE.switch_file_handle_pre_buffer_set(swigCPtr, SWIGTYPE_p_switch_buffer.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_file_handle_pre_buffer_get(swigCPtr); + SWIGTYPE_p_switch_buffer ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_buffer(cPtr, false); + return ret; + } + } + + public SWIGTYPE_p_unsigned_char pre_buffer_data { + set { + freeswitchPINVOKE.switch_file_handle_pre_buffer_data_set(swigCPtr, SWIGTYPE_p_unsigned_char.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_file_handle_pre_buffer_data_get(swigCPtr); + SWIGTYPE_p_unsigned_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); + return ret; + } + } + + public SWIGTYPE_p_switch_size_t pre_buffer_datalen { + set { + freeswitchPINVOKE.switch_file_handle_pre_buffer_datalen_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_file_handle_pre_buffer_datalen_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public string file { set { freeswitchPINVOKE.switch_file_handle_file_set(swigCPtr, value);

1 0

[commit] r11070 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 10 Jan '09

10 Jan '09

Author: silik0n Date: Sat Jan 10 01:38:59 2009 New Revision: 11070 Log: add option to return a specific field for API usage Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Sat Jan 10 01:38:59 2009 @@ -319,14 +319,43 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; + if (argc < 1 || argc > 2){ + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } if (!route_lookup(destnum, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } - - stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); - stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + if (argc != 2){ + stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); + stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + } else { + + /* char limit[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; + char acctcode[17]; + char translated[17]; + */ + + if (!strncasecmp(argv[1], "dialstring", 10)) { + stream->write_function(stream, "%s", results.dialstring); + } else if (!strncasecmp(argv[1], "translated", 10)) { + stream->write_function(stream, "%s", results.translated); + } else if (!strncasecmp(argv[1], "limit", 5)) { + stream->write_function(stream, "%s", results.limit); + } else if (!strncasecmp(argv[1], "group", 5)) { + stream->write_function(stream, "%s", results.group); + } else if (!strncasecmp(argv[1], "acctcode", 8)) { + stream->write_function(stream, "%s", results.acctcode); + } else { + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } + } } else { stream->write_function(stream, "Invalid Input!\n"); }

1 0

[commit] r11108 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by FreeSWITCH SVN 10 Jan '09

10 Jan '09

Author: anthm Date: Fri Jan 9 21:52:28 2009 New Revision: 11108 Log: fix double close of filehandles and add recording of native files Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Fri Jan 9 21:52:28 2009 @@ -251,7 +251,7 @@ done: - if (fh.file_interface) { + if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) { switch_core_file_close(&fh); } Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Fri Jan 9 21:52:28 2009 @@ -132,7 +132,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; switch_size_t want, got, orig_len = *len; - + switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); @@ -155,19 +155,21 @@ if (fh->pre_buffer) { switch_size_t rlen; + int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); + if (!switch_test_flag(fh, SWITCH_FILE_BUFFER_DONE)) { if (!switch_buffer_inuse(fh->pre_buffer)) { - rlen = fh->pre_buffer_datalen / 2; + rlen = asis ? fh->pre_buffer_datalen : fh->pre_buffer_datalen / 2; if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) { switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE); } else { - switch_buffer_write(fh->pre_buffer, fh->pre_buffer_data, rlen * 2); + switch_buffer_write(fh->pre_buffer, fh->pre_buffer_data, asis ? rlen : rlen * 2); } } } - rlen = switch_buffer_read(fh->pre_buffer, data, *len * 2); - *len = rlen / 2; + rlen = switch_buffer_read(fh->pre_buffer, data, asis ? *len : *len * 2); + *len = asis ? rlen : rlen / 2; if (*len == 0) { switch_set_flag(fh, SWITCH_FILE_DONE); @@ -277,13 +279,14 @@ if (fh->pre_buffer) { switch_size_t rlen, blen; switch_status_t status = SWITCH_STATUS_SUCCESS; + int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); - switch_buffer_write(fh->pre_buffer, data, *len * 2); + switch_buffer_write(fh->pre_buffer, data, asis ? *len : *len * 2); rlen = switch_buffer_inuse(fh->pre_buffer); if (rlen >= fh->pre_buffer_datalen) { blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - blen /= 2; + if (!asis) blen /= 2; if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { *len = 0; } @@ -345,6 +348,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + switch_clear_flag(fh, SWITCH_FILE_OPEN); status = fh->file_interface->file_close(fh); @@ -355,9 +362,11 @@ if (fh->pre_buffer) { if (switch_test_flag(fh, SWITCH_FILE_FLAG_WRITE)) { switch_size_t rlen, blen; + int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); + while((rlen = switch_buffer_inuse(fh->pre_buffer))) { blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - blen /= 2; + if (asis) blen /= 2; if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { break; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Jan 9 21:52:28 2009 @@ -384,6 +384,7 @@ const char *vval; time_t start = 0; uint32_t org_silence_hits = 0; + int asis = 0; switch_assert(read_codec != NULL); @@ -396,6 +397,30 @@ fh->channels = read_codec->implementation->number_of_channels; fh->native_rate = read_codec->implementation->actual_samples_per_second; + + + if (!strstr(file, SWITCH_URL_SEPARATOR)) { + char *ext; + const char *prefix; + + prefix = switch_channel_get_variable(channel, "sound_prefix"); + if (!prefix) { + prefix = SWITCH_GLOBAL_dirs.base_dir; + } + + if (!switch_is_file_path(file)) { + file = switch_core_session_sprintf(session, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file); + } + if ((ext = strrchr(file, '.'))) { + ext++; + } else { + ext = read_codec->implementation->iananame; + file = switch_core_session_sprintf(session, "%s.%s", file, ext); + asis = 1; + } + } + + if (switch_core_file_open(fh, file, fh->channels, @@ -444,37 +469,43 @@ switch_channel_set_variable(channel, "RECORD_DATE", NULL); } - codec_name = "L16"; - if (switch_core_codec_init(&codec, - codec_name, - NULL, - read_codec->implementation->actual_samples_per_second, - read_codec->implementation->microseconds_per_packet / 1000, - read_codec->implementation->number_of_channels, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, - switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); - switch_core_session_set_read_codec(session, &codec); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, - fh->channels, read_codec->implementation->microseconds_per_packet / 1000); - switch_core_file_close(fh); - switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); - return SWITCH_STATUS_GENERR; + if (!asis) { + codec_name = "L16"; + if (switch_core_codec_init(&codec, + codec_name, + NULL, + read_codec->implementation->actual_samples_per_second, + read_codec->implementation->microseconds_per_packet / 1000, + read_codec->implementation->number_of_channels, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); + switch_core_session_set_read_codec(session, &codec); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, + fh->channels, read_codec->implementation->microseconds_per_packet / 1000); + switch_core_file_close(fh); + switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); + return SWITCH_STATUS_GENERR; + } } if (limit) { start = switch_timestamp(NULL); } - + if (fh->thresh) { - if (fh->silence_hits) { - fh->silence_hits = fh->samplerate * fh->silence_hits / read_codec->implementation->samples_per_packet; + if (asis) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't detect silence on a native recording.\n"); } else { - fh->silence_hits = fh->samplerate * 3 / read_codec->implementation->samples_per_packet; + if (fh->silence_hits) { + fh->silence_hits = fh->samplerate * fh->silence_hits / read_codec->implementation->samples_per_packet; + } else { + fh->silence_hits = fh->samplerate * 3 / read_codec->implementation->samples_per_packet; + } + org_silence_hits = fh->silence_hits; } - org_silence_hits = fh->silence_hits; } for (;;) { @@ -543,7 +574,7 @@ } } - if (fh->thresh) { + if (!asis && fh->thresh) { int16_t *fdata = (int16_t *) read_frame->data; uint32_t samples = read_frame->datalen / sizeof(*fdata); uint32_t score, count = 0, j = 0; @@ -571,8 +602,8 @@ if (!switch_test_flag(fh, SWITCH_FILE_PAUSE) && !switch_test_flag(read_frame, SFF_CNG)) { int16_t *data = read_frame->data; - len = (switch_size_t) read_frame->datalen / 2; - + len = (switch_size_t) asis ? read_frame->datalen : read_frame->datalen / 2; + if (switch_core_file_write(fh, data, &len) != SWITCH_STATUS_SUCCESS) { break; }

1 0

[commit] r11069 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 10 Jan '09

10 Jan '09

Author: silik0n Date: Fri Jan 9 22:02:34 2009 New Revision: 11069 Log: fix a couple of SWITCH_LOG levels and properly disconnect from DB on shutdown Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Fri Jan 9 22:02:34 2009 @@ -257,7 +257,7 @@ switch_set_string(results->acctcode, pdata.acctcode); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error Setting Default Route!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DB Error Setting Default Route!\n"); switch_set_string(results->limit, "9999"); switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); switch_set_string(results->group, ""); @@ -290,7 +290,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; route_lookup(destnum, &results); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "EASY ROUTE DEST: [%s]\n", results.dialstring); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring); switch_channel_set_variable(channel, "easy_destnum", results.destnum); switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); switch_channel_set_variable(channel, "easy_group", results.group); @@ -354,7 +354,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown) { - switch_odbc_handle_connect(globals.master_odbc); + switch_odbc_handle_disconnect(globals.master_odbc); return SWITCH_STATUS_UNLOAD; }

1 0

[commit] r11106 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Jan '09

09 Jan '09

Author: anthm Date: Fri Jan 9 17:21:38 2009 New Revision: 11106 Log: MODENDP-167 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Jan 9 17:21:38 2009 @@ -2675,12 +2675,12 @@ if (call_id) { sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " - "from sip_registrations where call_id='%q'", ct, es, body, call_id + "from sip_registrations where call_id='%q'", ct, es, switch_str_nil(body), call_id ); } else { sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " "from sip_registrations where sip_user='%s' and sip_host='%q'", - ct, es, body, user, host + ct, es, switch_str_nil(body), switch_str_nil(user), switch_str_nil(host) ); }

1 0