March 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r7982 - freeswitch/trunk/build
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Sat Mar 29 14:56:20 2008 New Revision: 7982 Modified: freeswitch/trunk/build/getsounds.sh.in Log: Add quotes (fbsd sh needs them) and check if the command can be executed Modified: freeswitch/trunk/build/getsounds.sh.in ============================================================================== --- freeswitch/trunk/build/getsounds.sh.in (original) +++ freeswitch/trunk/build/getsounds.sh.in Sat Mar 29 14:56:20 2008 @@ -7,10 +7,10 @@ DIR=`pwd` -if [ -f $WGET ] ; then +if [ -x "$WGET" ] ; then DOWNLOAD_CMD=$WGET else - if [ -f $CURL ] ; then + if [ -x "$CURL" ] ; then DOWNLOAD_CMD="$CURL -O" fi fi

1 0

[Freeswitch-svn] [commit] r7981 - freeswitch/trunk
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: brian Date: Sat Mar 29 00:22:28 2008 New Revision: 7981 Modified: freeswitch/trunk/freeswitch.spec Log: fix spec file thanks andrew Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Mar 29 00:22:28 2008 @@ -237,7 +237,7 @@ # Add a freeswitch user with group daemon %pre %ifos linux -/usr/sbin/useradd -r -g daemon -s /bin/false -c "The FreeSWITCH Open Source Voice Platform" -d %{prefix}/var freeswitch 2> /dev/null || : +/usr/sbin/useradd -r -g daemon -s /bin/false -c "The FreeSWITCH Open Source Voice Platform" -d %{prefix} freeswitch 2> /dev/null || : %endif %post @@ -246,6 +246,8 @@ %{__mkdir} -p /etc/opt %{__ln_s} -f %{prefix}/conf /etc%{prefix} +chkconfig --add freeswitch + %postun %{?run_ldconfig:%run_ldconfig} %{__rm} -rf %{prefix}

1 0

[Freeswitch-svn] [commit] r7980 - freeswitch/trunk/scripts
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Fri Mar 28 20:57:04 2008 New Revision: 7980 Modified: freeswitch/trunk/scripts/fsxs.in Log: Update help text and copyright header. Modified: freeswitch/trunk/scripts/fsxs.in ============================================================================== --- freeswitch/trunk/scripts/fsxs.in (original) +++ freeswitch/trunk/scripts/fsxs.in Fri Mar 28 20:57:04 2008 @@ -1,8 +1,8 @@ #!/usr/bin/perl # -# FreeSwitch fsxs +# FreeSWITCH fsxs # -# (C) 2006 Stefan Knoblich <stkn(a)netdomination.org> +# (C) 2006-2008 Stefan Knoblich <stkn(a)netdomination.org> use strict; @@ -52,21 +52,21 @@ } sub fsxs_usage { - print "FreeSwitch fsxs\n(C) 2006-2008 Stefan Knoblich <stkn\(a)netdomination.org>\n"; + print "FreeSWITCH fsxs\n(C) 2006-2008 Stefan Knoblich <stkn\(a)netdomination.org>\n"; print "\n"; print "Usage:\n"; print "\t$0 compile [options] <file1 ...>\n"; print "\t$0 link [options] <target> <file1 ...>\n"; print "\t$0 build [options] <target> <file1 ...>\n"; print "\t$0 install [options] <file1 ...>\n\n"; - print "\t$0 show <var1>...[varN]\n"; - print "\t$0 <--var1>...<--varN>\n\n"; + print "\t$0 show <var1 ...varN>\n"; + print "\t$0 <--var1 ...--varN>\n\n"; print "Command description:\n"; print "\tcompile: Compile source file(s) into object file(s)\n"; print "\tlink: Create module from object file(s)\n"; print "\tbuild: Build module from source file(s) (compile + link)\n"; - print "\tinstall: Install module(s) into freeswitch module directory\n"; + print "\tinstall: Install module(s) into FreeSWITCH module directory\n"; print "\tshow: Show defined variable(s)\n"; print "\n";

1 0

[Freeswitch-svn] [commit] r7979 - freeswitch/trunk/scripts
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Fri Mar 28 20:49:21 2008 New Revision: 7979 Modified: freeswitch/trunk/scripts/fsxs.in Log: Change variable naming to be more configure-like (except for --confdir) Modified: freeswitch/trunk/scripts/fsxs.in ============================================================================== --- freeswitch/trunk/scripts/fsxs.in (original) +++ freeswitch/trunk/scripts/fsxs.in Fri Mar 28 20:49:21 2008 @@ -20,12 +20,12 @@ LDFLAGS => '@LDFLAGS@', SOLINK => '@SOLINK@', - MODULES_DIR => '@MODULES_DIR@', - LIB_DIR => '@LIB_DIR@', - BIN_DIR => '@BIN_DIR@', - INC_DIR => '@INC_DIR@', - DB_DIR => '@DB_DIR@', - CFG_DIR => '@CFG_DIR@', + MODULESDIR => '@MODULES_DIR@', + LIBDIR => '@LIB_DIR@', + BINDIR => '@BIN_DIR@', + INCLUDEDIR => '@INC_DIR@', + DBDIR => '@DB_DIR@', + CONFDIR => '@CFG_DIR@', PREFIX => '@PREFIX@' ); @@ -84,7 +84,7 @@ print "Variable names for \"fsxs show\" / \"fsxs --var\":\n"; print "\tcflags ldflags libs solink includes cc ld mkdir install\n"; - print "\tprefix lib_dir modules_dir db_dir inc_dir cfg_dir bin_dir\n"; + print "\tprefix libdir modulesdir dbdir includedir confdir bindir\n"; print "\n"; print "Examples:\n"; @@ -135,7 +135,7 @@ sub fsxs_install { my @files = @_; - my $destination = $vars{DESTDIR} . $vars{MODULES_DIR}; + my $destination = $vars{DESTDIR} . $vars{MODULESDIR}; # check if destination exists, create if it doesn't if( ! -e $destination ) {

1 0

[Freeswitch-svn] [commit] r7978 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: brian Date: Fri Mar 28 17:22:48 2008 New Revision: 7978 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: more info Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Mar 28 17:22:48 2008 @@ -20,13 +20,16 @@ <param name="sip-trace" value="no"/> <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/> +  <param name="sip-port" value="5060"/> <param name="dialplan" value="XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> +  <param name="rtp-ip" value="$${local_ip_v4}"/> +  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${moh_uri}"/>

1 0

[Freeswitch-svn] [commit] r7977 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 13:54:28 2008 New Revision: 7977 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: refactor a little Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Fri Mar 28 13:54:28 2008 @@ -65,14 +65,19 @@ static void do_reopen(cdr_fd_t *fd) { + int x = 0; if (fd->fd > -1) { close(fd->fd); fd->fd = -1; } - if ((fd->fd = open(fd->path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) > -1) { - fd->bytes = fd_size(fd->fd); + for (x = 0 ; x < 10; x++) { + if ((fd->fd = open(fd->path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) > -1) { + fd->bytes = fd_size(fd->fd); + break; + } + switch_yield(100000); } } @@ -101,58 +106,57 @@ do_reopen(fd); if (fd->fd < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", fd->path); + switch_event_t *event; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening %s\n", fd->path); + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Critical-Error", "Error opening cdr file %s\n", fd->path); + switch_event_fire(&event); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s CDR logfile %s\n", globals.rotate ? "Rotated" : "Re-opened", fd->path); } - + } static void write_cdr(const char *path, const char *log_line) { cdr_fd_t *fd = NULL; - - if ((fd = switch_core_hash_find(globals.fd_hash, path))) { - switch_mutex_lock(fd->mutex); - } else { - int lfd = open(path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); - - if (lfd > -1) { - fd = switch_core_alloc(globals.pool, sizeof(*fd)); - switch_mutex_init(&fd->mutex, SWITCH_MUTEX_NESTED, globals.pool); - fd->fd = lfd; - switch_mutex_lock(fd->mutex); - fd->path = switch_core_strdup(globals.pool, path); - fd->bytes = fd_size(fd->fd); - switch_core_hash_insert(globals.fd_hash, path, fd); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); - } + unsigned int bytes_in, bytes_out; + + if (!(fd = switch_core_hash_find(globals.fd_hash, path))) { + fd = switch_core_alloc(globals.pool, sizeof(*fd)); + switch_assert(fd); + memset(fd, 0, sizeof(*fd)); + fd->fd = -1; + switch_mutex_init(&fd->mutex, SWITCH_MUTEX_NESTED, globals.pool); + fd->path = switch_core_strdup(globals.pool, path); + switch_core_hash_insert(globals.fd_hash, path, fd); } - - if (fd) { - unsigned int bytes_in, bytes_out; - bytes_out = (unsigned)strlen(log_line); - - if (fd->bytes + bytes_out > UINT_MAX) { - do_rotate(fd); - } - + + switch_mutex_lock(fd->mutex); + bytes_out = (unsigned)strlen(log_line); + + if (fd->fd < 0) { + do_reopen(fd); if (fd->fd < 0) { - do_reopen(fd); - if (fd->fd < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); - return; - } - } - - if ((bytes_in = write(fd->fd, log_line, bytes_out)) != bytes_out) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s %d/%d\n", path, (int)bytes_in, (int)bytes_out); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); + goto end; } - fd->bytes += bytes_in; - switch_mutex_unlock(fd->mutex); } + if (fd->bytes + bytes_out > UINT_MAX) { + do_rotate(fd); + } + + if ((bytes_in = write(fd->fd, log_line, bytes_out)) != bytes_out) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s %d/%d\n", path, (int)bytes_in, (int)bytes_out); + } + + fd->bytes += bytes_in; + + end: + + switch_mutex_unlock(fd->mutex); } static switch_status_t my_on_hangup(switch_core_session_t *session)

1 0

[Freeswitch-svn] [commit] r7976 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 13:28:19 2008 New Revision: 7976 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: reset descriptor to -1 after closing file in rotate Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Fri Mar 28 13:28:19 2008 @@ -85,6 +85,7 @@ size_t len; close(fd->fd); + fd->fd = -1; if (globals.rotate) { switch_time_exp_lt(&tm, switch_timestamp_now());

1 0

[Freeswitch-svn] [commit] r7975 - freeswitch/trunk/src
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 11:27:17 2008 New Revision: 7975 Modified: freeswitch/trunk/src/switch_core_io.c Log: tweak Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Mar 28 11:27:17 2008 @@ -384,12 +384,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 1\n"); case SWITCH_STATUS_SUCCESS: session->enc_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); - session->enc_read_frame.timestamp = read_frame->timestamp; - session->enc_read_frame.rate = read_frame->rate; - session->enc_read_frame.ssrc = read_frame->ssrc; - session->enc_read_frame.seq = read_frame->seq; - session->enc_read_frame.m = read_frame->m; - session->enc_read_frame.payload = session->read_codec->implementation->ianacode; + if (perfect) { + session->enc_read_frame.timestamp = read_frame->timestamp; + session->enc_read_frame.rate = read_frame->rate; + session->enc_read_frame.ssrc = read_frame->ssrc; + session->enc_read_frame.seq = read_frame->seq; + session->enc_read_frame.m = read_frame->m; + session->enc_read_frame.payload = session->read_codec->implementation->ianacode; + } *frame = &session->enc_read_frame; break; case SWITCH_STATUS_NOOP: @@ -783,10 +785,8 @@ case SWITCH_STATUS_RESAMPLE: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; - session->enc_write_frame.seq = frame->seq; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; if (!session->write_resampler) { @@ -806,10 +806,6 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - if (!ptime_mismatch) { - session->enc_write_frame.timestamp = frame->timestamp; - session->enc_write_frame.seq = frame->seq; - } session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; @@ -824,10 +820,8 @@ } enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); - enc_frame->timestamp = frame->timestamp; enc_frame->m = frame->m; enc_frame->ssrc = frame->ssrc; - enc_frame->seq = frame->seq; enc_frame->payload = enc_frame->codec->implementation->ianacode; write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r7974 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 18:46:47 2008 New Revision: 7974 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_loadable_module.c Log: tweak Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Mar 27 18:46:47 2008 @@ -45,7 +45,7 @@ #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 #define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX / 2; else if (n < SWITCH_SMIN) n = SWITCH_SMIN / 2; -#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uk@%ui", \ +#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uh@%ui", \ codec->implementation->iananame, \ codec->implementation->samples_per_second, \ codec->implementation->microseconds_per_frame / 1000) 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 Thu Mar 27 18:46:47 2008 @@ -162,9 +162,6 @@ rate = imp->samples_per_second; - if (ptime && ptime != imp->microseconds_per_frame / 1000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); - } switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); @@ -343,7 +340,7 @@ codec_string = tech_pvt->profile->codec_string; } } - + if ((ocodec = switch_channel_get_variable(tech_pvt->channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { codec_string = ocodec; @@ -354,7 +351,7 @@ } } } - + if (codec_string) { char *tmp_codec_string; if ((tmp_codec_string = switch_core_session_strdup(tech_pvt->session, codec_string))) { Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Mar 27 18:46:47 2008 @@ -1251,11 +1251,10 @@ last = name = next = cur = buf; for (;;) { - - if (!next) { break; } + if ((p = strchr(next, '@'))) { *p++ = '\0'; }

1 0

[Freeswitch-svn] [commit] r7973 - in freeswitch/trunk/src: . include
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 18:22:46 2008 New Revision: 7973 Modified: freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c Log: fix some stuff Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Mar 27 18:22:46 2008 @@ -306,11 +306,14 @@ break; \ } +SWITCH_DECLARE(uint32_t) switch_core_codec_next_id(void); + #define SWITCH_ADD_CODEC(codec_int, int_name) \ for (;;) { \ - codec_int = (switch_codec_interface_t *)switch_loadable_module_create_interface(*module_interface, SWITCH_CODEC_INTERFACE); \ - codec_int->interface_name = switch_core_strdup(pool, int_name); \ - break; \ + codec_int = (switch_codec_interface_t *)switch_loadable_module_create_interface(*module_interface, SWITCH_CODEC_INTERFACE); \ + codec_int->interface_name = switch_core_strdup(pool, int_name); \ + codec_int->codec_id = switch_core_codec_next_id(); \ + break; \ } @@ -373,7 +376,7 @@ impl->encode = encode; impl->decode = decode; impl->destroy = destroy; - + impl->codec_id = codec_interface->codec_id; impl->next = codec_interface->implementations; codec_interface->implementations = impl; } Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Mar 27 18:22:46 2008 @@ -560,6 +560,7 @@ switch_core_codec_decode_func_t decode; /*! deinitalize a codec handle using this implementation */ switch_core_codec_destroy_func_t destroy; + uint32_t codec_id; struct switch_codec_implementation *next; }; @@ -569,6 +570,7 @@ const char *interface_name; /*! a list of codec implementations related to the codec */ switch_codec_implementation_t *implementations; + uint32_t codec_id; struct switch_codec_interface *next; }; Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Mar 27 18:22:46 2008 @@ -35,6 +35,14 @@ #include <switch.h> #include "private/switch_core_pvt.h" +static uint32_t CODEC_ID = 0; + +SWITCH_DECLARE(uint32_t) switch_core_codec_next_id(void) +{ + return CODEC_ID++; +} + + SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Mar 27 18:22:46 2008 @@ -323,7 +323,6 @@ } if (session->read_codec) { - if (session->read_resampler) { short *data = read_frame->data; switch_mutex_lock(session->resample_mutex); @@ -353,6 +352,7 @@ goto done; } } + if (perfect || switch_buffer_inuse(session->raw_read_buffer) >= session->read_codec->implementation->bytes_per_frame) { if (perfect) { @@ -484,7 +484,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_frame_t *enc_frame = NULL, *write_frame = frame; - unsigned int flag = 0, need_codec = 0, perfect = 0, do_bugs = 0, do_write = 0, do_resample = 0; + unsigned int flag = 0, need_codec = 0, perfect = 0, do_bugs = 0, do_write = 0, do_resample = 0, ptime_mismatch = 0; switch_io_flag_t io_flag = SWITCH_IO_FLAG_NOOP; switch_assert(session != NULL); @@ -514,6 +514,9 @@ if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE; + if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) { + ptime_mismatch = TRUE; + } } if (session->write_codec && !frame->codec) { @@ -525,13 +528,13 @@ } if (session->bugs && !need_codec) { - do_bugs = 1; - need_codec = 1; + do_bugs = TRUE; + need_codec = TRUE; } if (frame->codec->implementation->actual_samples_per_second != session->write_codec->implementation->actual_samples_per_second) { - need_codec = 1; - do_resample = 1; + need_codec = TRUE; + do_resample = TRUE; } if (need_codec) { @@ -671,7 +674,7 @@ } if (do_bugs) { - do_write = 1; + do_write = TRUE; write_frame = frame; goto done; } @@ -768,7 +771,7 @@ } else { rate = session->write_codec->implementation->actual_samples_per_second; } - + status = switch_core_codec_encode(session->write_codec, frame->codec, enc_frame->data, @@ -776,7 +779,6 @@ rate, session->enc_write_frame.data, &session->enc_write_frame.datalen, &session->enc_write_frame.rate, &flag); - switch (status) { case SWITCH_STATUS_RESAMPLE: session->enc_write_frame.codec = session->write_codec; @@ -804,10 +806,12 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; + if (!ptime_mismatch) { + session->enc_write_frame.timestamp = frame->timestamp; + session->enc_write_frame.seq = frame->seq; + } session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; - session->enc_write_frame.seq = frame->seq; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; break; @@ -855,6 +859,7 @@ if (flag & SFF_CNG) { switch_set_flag(write_frame, SFF_CNG); } + if ((status = perform_write(session, write_frame, timeout, io_flag, stream_id)) != SWITCH_STATUS_SUCCESS) { break; } @@ -865,7 +870,7 @@ } } } else { - do_write = 1; + do_write = TRUE; } done:

1 0