[Freeswitch-svn] [commit] r12629 - in freeswitch/trunk/src/mod: applications/mod_conference codecs/mod_g729 endpoints/mod_reference endpoints/mod_sofia
FreeSWITCH SVN
mrene at freeswitch.org
Mon Mar 16 13:30:53 PDT 2009
Author: mrene
Date: Mon Mar 16 15:30:53 2009
New Revision: 12629
Log:
Revert unwanted changes
Modified:
freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c
freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c
freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Mar 16 15:30:53 2009
@@ -2922,7 +2922,7 @@
{
switch_event_t *event;
- if (member == NULL || switch_test_flag(member, MFLAG_NOCHANNEL))
+ if (member == NULL)
return SWITCH_STATUS_GENERR;
switch_mutex_lock(member->control_mutex);
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Mon Mar 16 15:30:53 2009
@@ -1,7 +1,7 @@
BASE=../../../..
-DIR=./g729abc
-A=$(DIR)/libg729ab.a
+DIR=$(BASE)/libs/libg729
+A=$(DIR)/.libs/libg729.a
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)" ; else echo "-DG729_PASSTHROUGH" ; fi ;
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Mon Mar 16 15:30:53 2009
@@ -38,7 +38,7 @@
SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
#ifndef G729_PASSTHROUGH
-#include "g729ab.h"
+#include "g729.h"
struct g729_context {
struct dec_state decoder_object;
@@ -112,7 +112,7 @@
if (decoded_data_len % 160 == 0) {
uint32_t new_len = 0;
INT16 *ddp = decoded_data;
- unsigned char *edp = encoded_data;
+ char *edp = encoded_data;
int x;
int loops = (int) decoded_data_len / 160;
@@ -170,7 +170,7 @@
if (encoded_data_len % divisor == 0) {
uint8_t *test;
int loops = (int) encoded_data_len / divisor;
- unsigned char *edp = encoded_data;
+ char *edp = encoded_data;
short *ddp = decoded_data;
int x;
uint32_t new_len = 0;
Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Mar 16 15:30:53 2009
@@ -272,6 +272,8 @@
{
switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL;
+ switch_time_t started = switch_time_now();
+ unsigned int elapsed;
switch_byte_t *data;
channel = switch_core_session_get_channel(session);
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 Mon Mar 16 15:30:53 2009
@@ -2691,7 +2691,7 @@
}
}
- if (channel && sip && (status >= 300 && status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) {
+ if (channel && sip && (status >= 300 || status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) {
sip_contact_t * p_contact = sip->sip_contact;
int i = 0;
char var_name[80];
More information about the Freeswitch-svn
mailing list