- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5093 - in freeswitch/trunk: conf libs/stfu src src/mod/timers/mod_softtimer
by Freeswitch SVN 05 May '07

05 May '07

Author: anthm Date: Fri May 4 21:31:54 2007 New Revision: 5093 Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/libs/stfu/stfu.c freeswitch/trunk/libs/stfu/stfu.h freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Fri May 4 21:31:54 2007 @@ -53,7 +53,7 @@  <action application="set" data="ringback=${us-ring}"/>  -  +  <action application="bridge" data="sofia/$${sip_profile}/1234(a)conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Fri May 4 21:31:54 2007 @@ -90,6 +90,21 @@ return i; } +void stfu_n_reset(stfu_instance_t *i) +{ + i->in_queue = &i->a_queue; + i->out_queue = &i->b_queue; + i->in_queue->array_len = 0; + i->out_queue->array_len = 0; + i->out_queue->wr_len = 0; + i->out_queue->last_index = 0; + i->miss_count = 0; + i->last_ts = 0; + i->running = 0; + i->miss_count = 0; + i->interval = 0; +} + static int32_t stfu_n_measure_interval(stfu_queue_t *queue) { uint32_t index; @@ -148,7 +163,7 @@ i->out_queue->wr_len = 0; i->out_queue->last_index = 0; i->miss_count = 0; - + if (stfu_n_process(i, i->out_queue) < 0) { return STFU_IT_FAILED; } @@ -183,7 +198,7 @@ stfu_frame_t *frame = NULL, *rframe = NULL; - if ((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len) { + if (((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len)) { return NULL; } @@ -199,7 +214,7 @@ } frame = &i->out_queue->array[index]; - + if (frame->ts != should_have) { int tried = 0; for (index2 = 0; index2 < i->out_queue->array_len; index2++) { @@ -226,12 +241,13 @@ i->miss_count++; - if (i->miss_count > 10 || i->in_queue->array_len == i->in_queue->array_size ) { - i->out_queue->wr_len = i->out_queue->array_len; - i->last_ts = should_have = frame->ts; + if (i->miss_count > 10 || (i->in_queue->array_len == i->in_queue->array_size) || tried >= i->in_queue->array_size) { + i->running = 0; + i->interval = 0; + i->out_queue->wr_len = i->out_queue->array_size; return NULL; } - + i->last_ts = should_have; rframe = &i->out_queue->int_frame; rframe->dlen = i->out_queue->array[i->out_queue->last_index].dlen; Modified: freeswitch/trunk/libs/stfu/stfu.h ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.h (original) +++ freeswitch/trunk/libs/stfu/stfu.h Fri May 4 21:31:54 2007 @@ -88,7 +88,9 @@ stfu_instance_t *stfu_n_init(uint32_t qlen); stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last); stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i); -#define stfu_im_done() stfu_n_add_data(i, 0, NULL, 0, 1) +void stfu_n_reset(stfu_instance_t *i); + +#define stfu_im_done(i) stfu_n_add_data(i, 0, NULL, 0, 1) #define stfu_n_eat(i,t,d,l) stfu_n_add_data(i, t, d, l, 0) #ifdef __cplusplus Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Fri May 4 21:31:54 2007 @@ -73,7 +73,7 @@ { timer_private_t *private_info; - if (globals.RUNNING != 1) { + if (globals.RUNNING != 1 || !globals.mutex) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 4 21:31:54 2007 @@ -816,6 +816,7 @@ switch_size_t bytes = 0; switch_status_t status; uint8_t check = 1; + stfu_frame_t *jb_frame; if (!rtp_session->timer.interval) { rtp_session->last_time = switch_time_now(); @@ -833,22 +834,23 @@ return -1; } - if (rtp_session->jb && bytes) { - stfu_frame_t *frame; + if (rtp_session->jb && bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) { + if (rtp_session->recv_msg.header.m) { + stfu_n_reset(rtp_session->jb); + } stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); - if ((frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, frame->data, frame->dlen); - if (frame->plc) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { *flags |= SFF_PLC; - } - bytes = frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(frame->ts); + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); } else { bytes = 0; continue; - } - + } } if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { @@ -882,15 +884,22 @@ if (check) { do_2833(rtp_session); - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { + + if (rtp_session->jb && (jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + } else if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; /* We're late! We're Late! */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { switch_yield(1000); continue; } - + memset(data, 0, 2); data[0] = 65;

1 0

[commit] r5092 - in freeswitch/trunk: libs/stfu w32/Library
by Freeswitch SVN 04 May '07

04 May '07

Author: mikej Date: Fri May 4 19:53:43 2007 New Revision: 5092 Modified: freeswitch/trunk/libs/stfu/stfu.c freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: stfu msvc Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Fri May 4 19:53:43 2007 @@ -27,6 +27,11 @@ */ #include "stfu.h" +#ifdef _MSC_VER +/* warning C4706: assignment within conditional expression*/ +#pragma warning(disable: 4706) +#endif + struct stfu_queue { struct stfu_frame *array; struct stfu_frame int_frame; Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri May 4 19:53:43 2007 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -136,7 +136,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" @@ -208,6 +208,30 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File + RelativePath="..\..\libs\stfu\stfu.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\switch_apr.c" > </File> @@ -390,6 +414,10 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File + RelativePath="..\..\libs\stfu\stfu.h" + > + </File> + <File RelativePath="..\..\src\include\switch.h" > </File>

1 0

[commit] r5091 - freeswitch/trunk/libs/stfu
by Freeswitch SVN 04 May '07

04 May '07

Author: anthm Date: Fri May 4 19:46:26 2007 New Revision: 5091 Modified: freeswitch/trunk/libs/stfu/stfu.c Log: update Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Fri May 4 19:46:26 2007 @@ -85,7 +85,7 @@ return i; } -static int32_t stfu_n_measure_interval(stfu_instance_t *i, stfu_queue_t *queue) +static int32_t stfu_n_measure_interval(stfu_queue_t *queue) { uint32_t index; int32_t d, most = 0, last = 0, this, track[STFU_MAX_TRACK] = {0}; @@ -114,7 +114,7 @@ static int16_t stfu_n_process(stfu_instance_t *i, stfu_queue_t *queue) { - if (!i->interval && !(i->interval = stfu_n_measure_interval(i, queue))) { + if (!i->interval && !(i->interval = stfu_n_measure_interval(queue))) { return -1; }

1 0

[commit] r5090 - in freeswitch/trunk: . conf libs/stfu src src/include src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 May '07

04 May '07

Author: anthm Date: Fri May 4 19:29:35 2007 New Revision: 5090 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/conf/default_context.xml freeswitch/trunk/libs/stfu/stfu.c freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: add a fixed jitterbuffer to rtp (settable from a channel variable) (libSTFU) Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri May 4 19:29:35 2007 @@ -57,6 +57,7 @@ src/switch_stun.c\ src/switch_log.c\ src/switch_xml.c\ +libs/stfu/stfu.c\ libs/libteletone/src/libteletone_detect.c\ libs/libteletone/src/libteletone_generate.c @@ -95,6 +96,7 @@ CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` +CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Fri May 4 19:29:35 2007 @@ -53,6 +53,7 @@  <action application="set" data="ringback=${us-ring}"/>  +  <action application="bridge" data="sofia/$${sip_profile}/1234(a)conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Fri May 4 19:29:35 2007 @@ -163,7 +163,6 @@ cplen = sizeof(frame->data); } - memcpy(frame->data, data, cplen); frame->ts = ts; frame->dlen = cplen; @@ -185,7 +184,9 @@ if (i->running) { should_have = i->last_ts + i->interval; - } + } else { + should_have = i->out_queue->array[0].ts; + } for(index = 0; index < i->out_queue->array_len; index++) { if (i->out_queue->array[index].was_read) { @@ -220,11 +221,12 @@ i->miss_count++; - if (i->miss_count > 10) { + if (i->miss_count > 10 || i->in_queue->array_len == i->in_queue->array_size ) { i->out_queue->wr_len = i->out_queue->array_len; i->last_ts = should_have = frame->ts; return NULL; } + i->last_ts = should_have; rframe = &i->out_queue->int_frame; rframe->dlen = i->out_queue->array[i->out_queue->last_index].dlen; @@ -248,6 +250,7 @@ i->last_ts = rframe->ts; rframe->was_read = 1; i->running = 1; + i->miss_count = 0; } return rframe; Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri May 4 19:29:35 2007 @@ -165,6 +165,14 @@ */ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_session, char *login, char *rlogin); +/*! + \brief Acvite a jitter buffer on an RTP session + \param rtp_session the rtp session + \param queue_frames the number of frames to delay + \return SWITCH_STATUS_SUCCESS +*/ +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames); + /*! \brief Set an RTP Flag \param rtp_session the RTP session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri May 4 19:29:35 2007 @@ -589,16 +589,18 @@ \brief Frame Flags <pre> -SFF_CNG = (1 << 0) - Frame represents comfort noise -SFF_RAW_RTP = (1 << 1) - Frame has raw rtp accessible -SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header +SFF_CNG = (1 << 0) - Frame represents comfort noise +SFF_RAW_RTP = (1 << 1) - Frame has raw rtp accessible +SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header +SFF_PLC = (1 << 3) - Frame has generated PLC data </pre> */ typedef enum { SFF_NONE = 0, SFF_CNG = (1 << 0), SFF_RAW_RTP = (1 << 1), - SFF_RTP_HEADER = (1 << 2) + SFF_RTP_HEADER = (1 << 2), + SFF_PLC = (1 << 3) } switch_frame_flag_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 Fri May 4 19:29:35 2007 @@ -949,6 +949,23 @@ switch_channel_get_name(switch_core_session_get_channel(tech_pvt->session)), vad_in ? "in" : "", vad_out ? "out" : ""); } + if ((val = switch_channel_get_variable(channel, "jitterbuffer_msec"))) { + int len = atoi(val); + + if (len < 100 || len > 1000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] myst be between 100 and 1000\n", len); + } else { + int qlen; + + qlen = len / (tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting Jitterbuffer to %dms (%d frames)\n", len, qlen); + switch_rtp_activate_jitter_buffer(tech_pvt->rtp_session, qlen); + } + } + + + if (tech_pvt->te) { switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 4 19:29:35 2007 @@ -42,7 +42,7 @@ #undef inline #include <datatypes.h> #include <srtp.h> - +#include "stfu.h" #define MAX_KEY_LEN 64 #define rtp_header_len 12 #define RTP_START_PORT 16384 @@ -164,6 +164,7 @@ uint8_t ready; uint8_t cn; switch_time_t last_time; + stfu_instance_t *jb; }; static int global_init = 0; @@ -586,6 +587,13 @@ } +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) +{ + rtp_session->jb = stfu_n_init(queue_frames); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_session, char *login, char *rlogin) { char ice_user[80]; @@ -632,6 +640,10 @@ switch_mutex_lock((*rtp_session)->flag_mutex); + if ((*rtp_session)->jb) { + stfu_n_destroy(&(*rtp_session)->jb); + } + if ((*rtp_session)->dtmf_data.dtmf_buffer) { switch_buffer_destroy(&(*rtp_session)->dtmf_data.dtmf_buffer); } @@ -821,6 +833,24 @@ return -1; } + if (rtp_session->jb && bytes) { + stfu_frame_t *frame; + + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); + if ((frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, frame->data, frame->dlen); + if (frame->plc) { + *flags |= SFF_PLC; + } + bytes = frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(frame->ts); + } else { + bytes = 0; + continue; + } + + } + if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); @@ -907,6 +937,7 @@ bytes = sbytes; } + if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { if (rtp_session->ms_per_packet) { @@ -996,6 +1027,7 @@ continue; } + break; }

1 0

[commit] r5089 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 May '07

04 May '07

Author: mikej Date: Fri May 4 18:38:24 2007 New Revision: 5089 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add sip_subject channel var when header is there. 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 May 4 18:38:24 2007 @@ -1820,6 +1820,10 @@ switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); } + if (sip->sip_subject && sip->sip_subject->g_string) { + switch_channel_set_variable(channel, "sip_subject", sip->sip_subject->g_string); + } + if (sip->sip_via) { if (sip->sip_via->v_host) { switch_channel_set_variable(channel, "sip_via_host", sip->sip_via->v_host);

1 0

[commit] r5088 - freeswitch/trunk/libs/stfu
by Freeswitch SVN 04 May '07

04 May '07

Author: anthm Date: Fri May 4 17:27:54 2007 New Revision: 5088 Modified: freeswitch/trunk/libs/stfu/stfu.h Log: add headers Modified: freeswitch/trunk/libs/stfu/stfu.h ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.h (original) +++ freeswitch/trunk/libs/stfu/stfu.h Fri May 4 17:27:54 2007 @@ -36,6 +36,8 @@ #endif #include <stdio.h> +#include <stdlib.h> +#include <string.h> #ifdef _MSC_VER #ifndef uint32_t

1 0

[commit] r5087 - freeswitch/trunk/libs/stfu
by Freeswitch SVN 04 May '07

04 May '07

Author: anthm Date: Fri May 4 17:11:27 2007 New Revision: 5087 Added: freeswitch/trunk/libs/stfu/ freeswitch/trunk/libs/stfu/stfu.c freeswitch/trunk/libs/stfu/stfu.h Log: STFU Added: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/stfu/stfu.c Fri May 4 17:11:27 2007 @@ -0,0 +1,256 @@ +/* + * STFU (S)ort (T)ransportable (F)ramed (U)tterances + * Copyright (c) 2007 Anthony Minessale II <anthmct(a)yahoo.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * THOSE WHO DISAGREE MAY CERTIANLY STFU + */ +#include "stfu.h" + +struct stfu_queue { + struct stfu_frame *array; + struct stfu_frame int_frame; + uint32_t array_size; + uint32_t array_len; + uint32_t wr_len; + uint32_t last_index; +}; +typedef struct stfu_queue stfu_queue_t; + +struct stfu_instance { + struct stfu_queue a_queue; + struct stfu_queue b_queue; + struct stfu_queue *in_queue; + struct stfu_queue *out_queue; + uint32_t last_ts; + uint32_t interval; + uint32_t miss_count; + uint8_t running; +}; + + +static void stfu_n_init_aqueue(stfu_queue_t *queue, uint32_t qlen) +{ + queue->array = calloc(qlen, sizeof(struct stfu_frame)); + assert(queue->array != NULL); + memset(queue->array, 0, sizeof(struct stfu_frame) * qlen); + queue->array_size = qlen; + queue->int_frame.plc = 1; +} + +void stfu_n_destroy(stfu_instance_t **i) +{ + stfu_instance_t *ii; + + if (i && *i) { + ii = *i; + *i = NULL; + free(ii->a_queue.array); + free(ii->b_queue.array); + free(ii); + } +} + +stfu_instance_t *stfu_n_init(uint32_t qlen) +{ + struct stfu_instance *i; + + i = malloc(sizeof(*i)); + assert(i != NULL); + memset(i, 0, sizeof(*i)); + stfu_n_init_aqueue(&i->a_queue, qlen); + stfu_n_init_aqueue(&i->b_queue, qlen); + i->in_queue = &i->a_queue; + i->out_queue = &i->b_queue; + return i; +} + +static int32_t stfu_n_measure_interval(stfu_instance_t *i, stfu_queue_t *queue) +{ + uint32_t index; + int32_t d, most = 0, last = 0, this, track[STFU_MAX_TRACK] = {0}; + + for(index = 0; index < queue->array_len; index++) { + this = queue->array[index].ts; + if (last) { + + if ((d = this - last) > 0 && d / 10 < STFU_MAX_TRACK) { + track[(d/10)]++; + } + } + + last = this; + } + + for(index = 0; index < STFU_MAX_TRACK; index++) { + if (track[index] > most) { + most = index; + } + } + + return most * 10; + +} + +static int16_t stfu_n_process(stfu_instance_t *i, stfu_queue_t *queue) +{ + if (!i->interval && !(i->interval = stfu_n_measure_interval(i, queue))) { + return -1; + } + + return 0; +} + +stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last) +{ + uint32_t index; + stfu_frame_t *frame; + size_t cplen = 0; + + + if (last || i->in_queue->array_len == i->in_queue->array_size) { + stfu_queue_t *other_queue; + + if (i->out_queue->wr_len < i->out_queue->array_len) { + return STFU_IT_FAILED; + } + + other_queue = i->in_queue; + i->in_queue = i->out_queue; + i->out_queue = other_queue; + + i->in_queue->array_len = 0; + i->out_queue->wr_len = 0; + i->out_queue->last_index = 0; + i->miss_count = 0; + + if (stfu_n_process(i, i->out_queue) < 0) { + return STFU_IT_FAILED; + } + for(index = 0; index < i->out_queue->array_len; index++) { + i->out_queue->array[index].was_read = 0; + } + } + + if (last) { + return STFU_IM_DONE; + } + + index = i->in_queue->array_len++; + frame = &i->in_queue->array[index]; + + if ((cplen = datalen) > sizeof(frame->data)) { + cplen = sizeof(frame->data); + } + + + memcpy(frame->data, data, cplen); + frame->ts = ts; + frame->dlen = cplen; + frame->was_read = 0; + + return STFU_IT_WORKED; +} + +stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i) +{ + uint32_t index, index2; + uint32_t should_have = 0; + stfu_frame_t *frame = NULL, *rframe = NULL; + + + if ((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len) { + return NULL; + } + + if (i->running) { + should_have = i->last_ts + i->interval; + } + + for(index = 0; index < i->out_queue->array_len; index++) { + if (i->out_queue->array[index].was_read) { + continue; + } + + frame = &i->out_queue->array[index]; + + if (frame->ts != should_have) { + int tried = 0; + for (index2 = 0; index2 < i->out_queue->array_len; index2++) { + if (i->out_queue->array[index2].was_read) { + continue; + } + tried++; + if (i->out_queue->array[index2].ts == should_have) { + rframe = &i->out_queue->array[index2]; + i->out_queue->last_index = index2; + goto done; + } + } + for (index2 = 0; index2 < i->in_queue->array_len; index2++) { + if (i->in_queue->array[index2].was_read) { + continue; + } + tried++; + if (i->in_queue->array[index2].ts == should_have) { + rframe = &i->in_queue->array[index2]; + goto done; + } + } + + i->miss_count++; + + if (i->miss_count > 10) { + i->out_queue->wr_len = i->out_queue->array_len; + i->last_ts = should_have = frame->ts; + return NULL; + } + i->last_ts = should_have; + rframe = &i->out_queue->int_frame; + rframe->dlen = i->out_queue->array[i->out_queue->last_index].dlen; + /* poor man's plc.. Copy the last frame, but we flag it so you can use a better one if you wish */ + memcpy(rframe->data, i->out_queue->array[i->out_queue->last_index].data, rframe->dlen); + rframe->ts = should_have; + i->out_queue->wr_len++; + i->running = 1; + return rframe; + } else { + rframe = &i->out_queue->array[index]; + i->out_queue->last_index = index; + goto done; + } + } + + done: + + if (rframe) { + i->out_queue->wr_len++; + i->last_ts = rframe->ts; + rframe->was_read = 1; + i->running = 1; + } + + return rframe; +} + + Added: freeswitch/trunk/libs/stfu/stfu.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/stfu/stfu.h Fri May 4 17:11:27 2007 @@ -0,0 +1,96 @@ +/* + * STFU (S)ort (T)ransportable (F)ramed (U)tterances + * Copyright (c) 2007 Anthony Minessale II <anthmct(a)yahoo.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * THOSE WHO DISAGREE MAY CERTIANLY STFU + */ + +#ifndef STFU_H +#define STFU_H +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __STUPIDFORMATBUG__ +} +#endif + +#include <stdio.h> + +#ifdef _MSC_VER +#ifndef uint32_t +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; +typedef __int8 int8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned long in_addr_t; +#endif +#define snprintf _snprintf +#else +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <time.h> +#include <inttypes.h> +#endif +#include <assert.h> + +#define STFU_DATALEN 16384 +#define STFU_QLEN 300 +#define STFU_MAX_TRACK 256 + +typedef enum { + STFU_IT_FAILED, + STFU_IT_WORKED, + STFU_IM_DONE +} stfu_status_t; + +struct stfu_frame { + uint32_t ts; + uint8_t data[STFU_DATALEN]; + size_t dlen; + uint8_t was_read; + uint8_t plc; +}; +typedef struct stfu_frame stfu_frame_t; + +struct stfu_instance; +typedef struct stfu_instance stfu_instance_t; + +void stfu_n_destroy(stfu_instance_t **i); +stfu_instance_t *stfu_n_init(uint32_t qlen); +stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last); +stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i); +#define stfu_im_done() stfu_n_add_data(i, 0, NULL, 0, 1) +#define stfu_n_eat(i,t,d,l) stfu_n_add_data(i, t, d, l, 0) + +#ifdef __cplusplus +} +#endif +#endif /*STFU_H*/ +

1 0

[commit] r5086 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 04 May '07

04 May '07

Author: mikej Date: Thu May 3 22:14:40 2007 New Revision: 5086 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: fix type Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu May 3 22:14:40 2007 @@ -399,16 +399,16 @@ assert(channel != NULL); if (data && (level = strdup(data))) { - switch_log_level_t etype = SWITCH_LOG_DEBUG; + switch_log_level_t ltype = SWITCH_LOG_DEBUG; if ((log_str = strchr(level, ' '))) { *log_str++ = '\0'; - switch_name_event(level, &etype); + ltype = switch_log_str2level(level); } else { log_str = level; } - switch_log_printf(SWITCH_CHANNEL_LOG, etype, "%s\n", log_str); + switch_log_printf(SWITCH_CHANNEL_LOG, ltype, "%s\n", log_str); switch_safe_free(level); } }

1 0

[commit] r5085 - in freeswitch/trunk/src/mod: applications/mod_commands applications/mod_dptools applications/mod_enum applications/mod_rss codecs/mod_g726
by Freeswitch SVN 04 May '07

04 May '07

Author: mikej Date: Thu May 3 22:09:24 2007 New Revision: 5085 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: warnings cleanup. 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 Thu May 3 22:09:24 2007 @@ -713,7 +713,7 @@ switch_core_session_rwunlock(caller_session); } - return SWITCH_STATUS_SUCCESS;; + return SWITCH_STATUS_SUCCESS; } static void sch_api_callback(switch_scheduler_task_t *task) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu May 3 22:09:24 2007 @@ -399,7 +399,7 @@ assert(channel != NULL); if (data && (level = strdup(data))) { - switch_event_types_t etype = SWITCH_LOG_DEBUG; + switch_log_level_t etype = SWITCH_LOG_DEBUG; if ((log_str = strchr(level, ' '))) { *log_str++ = '\0'; Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Thu May 3 22:09:24 2007 @@ -384,7 +384,8 @@ cur = dns_payload(pkt); dns_getdn(pkt, &cur, end, dn, sizeof(dn)); dns_initparse(&p, NULL, pkt, cur, end); - p.dnsp_qcls = p.dnsp_qtyp = 0; + p.dnsp_qcls = 0; + p.dnsp_qtyp = 0; qdn = dn; nrr = 0; while ((r = dns_nextrr(&p, &rr)) > 0) { Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu May 3 22:09:24 2007 @@ -114,12 +114,10 @@ switch_core_speech_text_param_tts(dtb->sh, "voice", "next"); switch_set_flag(dtb, SFLAG_INFO); return SWITCH_STATUS_BREAK; - break; case '9': switch_core_speech_text_param_tts(dtb->sh, "voice", dtb->voice); switch_set_flag(dtb, SFLAG_INFO); return SWITCH_STATUS_BREAK; - break; case '2': if (dtb->speed < 260) { dtb->speed += 30; @@ -490,7 +488,6 @@ break; case '#': goto main_menu; - break; } } } Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Thu May 3 22:09:24 2007 @@ -89,7 +89,6 @@ default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid Encoding Size %d!\n", codec->implementation->encoded_bytes_per_frame); return SWITCH_STATUS_FALSE; - break; } g726_init_state(&handle->context);

1 0

[commit] r5084 - freeswitch/trunk/src/mod/languages/mod_mono
by Freeswitch SVN 04 May '07

04 May '07

Author: mikej Date: Thu May 3 21:25:29 2007 New Revision: 5084 Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Log: fix mod_mono build. still needs some testing Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Thu May 3 21:25:29 2007 @@ -8,7 +8,7 @@ PKGCONFIG = pkg-config-0.21 PKGCONFIG_DIR = $(switch_srcdir)/libs/$(PKGCONFIG) -LOCAL_CFLAGS=`$(PREFIX)/bin/pkg-config --cflags mono` +LOCAL_CFLAGS=-w `$(PREFIX)/bin/pkg-config --cflags mono` LOCAL_LDFLAGS=`$(PREFIX)/bin/pkg-config --libs mono` include ../../../../build/modmake.rules Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Thu May 3 21:25:29 2007 @@ -96,12 +96,10 @@ char *assembly_dir = (char *) switch_core_alloc(mono_pool, assembly_dir_len); char *assembly_file = (char *) switch_core_alloc(mono_pool, assembly_file_len); - apr_finfo_t *assembly_finfo = (apr_finfo_t *) switch_core_alloc(mono_pool, sizeof(*assembly_finfo)); - snprintf(assembly_dir, assembly_dir_len, "%s/%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR); snprintf(assembly_file, assembly_file_len, "%s/%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR, SWITCH_MONO_ASSEMBLY); - if (apr_stat(assembly_finfo, assembly_file, 0, mono_pool) != SWITCH_STATUS_SUCCESS) { + if (switch_file_exists(assembly_file, mono_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not find FreeSwitch.NET assembly\n"); return SWITCH_STATUS_FALSE; } @@ -143,7 +141,7 @@ for (p = switch_hash_first(mono_pool, globals.plugins); p; p = switch_hash_next(p)) { mono_plugin *plugin = (mono_plugin *) switch_core_alloc(mono_pool, sizeof(*plugin)); - apr_ssize_t *key_length = NULL; + switch_ssize_t *key_length = NULL; const void *key = NULL; void *value = NULL; @@ -177,19 +175,14 @@ */ switch_status_t mod_mono_load_modules(const char *module_dir) { - apr_finfo_t *module_finfo = (apr_finfo_t *) switch_core_alloc(mono_pool, sizeof(*module_finfo)); - - if (apr_stat(module_finfo, module_dir, 0, mono_pool) != SWITCH_STATUS_SUCCESS) { + if (switch_file_exists(module_dir, mono_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not access module dir!.\n"); return SWITCH_STATUS_FALSE; } - apr_dir_t *module_dir_handle; + switch_dir_t *module_dir_handle; char *file; size_t len; - char *ptr; - apr_finfo_t finfo; - apr_int32_t finfo_flags = APR_FINFO_DIRENT | APR_FINFO_TYPE | APR_FINFO_NAME; const char *ext = ".dll"; const char *EXT = ".DLL"; MonoAssembly *assembly; @@ -197,24 +190,15 @@ gpointer iter; iter = NULL; mono_plugin *plugin = NULL; + const char *fname = NULL; - if (apr_dir_open(&module_dir_handle, module_dir, mono_pool) != SWITCH_STATUS_SUCCESS) + if (switch_dir_open(&module_dir_handle, module_dir, mono_pool) != SWITCH_STATUS_SUCCESS) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not open directory: %s\n", module_dir); /* Read the modules directory */ - while (apr_dir_read(&finfo, finfo_flags, module_dir_handle) == SWITCH_STATUS_SUCCESS) { + while ((fname = switch_dir_next_file(module_dir_handle))) { assembly = (MonoAssembly *) switch_core_alloc(mono_pool, sizeof(assembly)); image = (MonoImage *) switch_core_alloc(mono_pool, sizeof(image)); - const char *fname = finfo.fname; - - if (finfo.filetype != APR_REG) - continue; - - if (!fname) - fname = finfo.name; - - if (!(ptr = (char *) fname)) - continue; if (!strstr(fname, ext) && !strstr(fname, EXT)) continue;

1 0