kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert unwanted changes 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12629 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2009-03-16 20:30:53 +00:00
parent 53ab0e2aef
commit 799779e3a6
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2922,7 +2922,7 @@ static switch_status_t conf_api_sub_kick(conference_member_t *member, switch_str
{ {
switch_event_t *event; switch_event_t *event;
if (member == NULL || switch_test_flag(member, MFLAG_NOCHANNEL)) if (member == NULL)
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
switch_mutex_lock(member->control_mutex); switch_mutex_lock(member->control_mutex);

6
src/mod/codecs/mod_g729/Makefile
View File

@ -1,7 +1,7 @@
BASE=../../../.. BASE=../../../..
DIR=./g729abc DIR=$(BASE)/libs/libg729
A=$(DIR)/libg729ab.a 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) LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
include $(BASE)/build/modmake.rules include $(BASE)/build/modmake.rules

6
src/mod/codecs/mod_g729/mod_g729.c
View File

@ -38,7 +38,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load);
SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL); SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
#ifndef G729_PASSTHROUGH #ifndef G729_PASSTHROUGH
#include "g729ab.h" #include "g729.h"
struct g729_context { struct g729_context {
struct dec_state decoder_object; struct dec_state decoder_object;
@ -112,7 +112,7 @@ static switch_status_t switch_g729_encode(switch_codec_t *codec,
if (decoded_data_len % 160 == 0) { if (decoded_data_len % 160 == 0) {
uint32_t new_len = 0; uint32_t new_len = 0;
INT16 *ddp = decoded_data; INT16 *ddp = decoded_data;
unsigned char *edp = encoded_data; char *edp = encoded_data;
int x; int x;
int loops = (int) decoded_data_len / 160; int loops = (int) decoded_data_len / 160;
@ -170,7 +170,7 @@ static switch_status_t switch_g729_decode(switch_codec_t *codec,
if (encoded_data_len % divisor == 0) { if (encoded_data_len % divisor == 0) {
uint8_t *test; uint8_t *test;
int loops = (int) encoded_data_len / divisor; int loops = (int) encoded_data_len / divisor;
unsigned char *edp = encoded_data; char *edp = encoded_data;
short *ddp = decoded_data; short *ddp = decoded_data;
int x; int x;
uint32_t new_len = 0; uint32_t new_len = 0;

2
src/mod/endpoints/mod_reference/mod_reference.c
View File

@ -272,6 +272,8 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
{ {
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL; private_t *tech_pvt = NULL;
switch_time_t started = switch_time_now();
unsigned int elapsed;
switch_byte_t *data; switch_byte_t *data;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);

2
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -2691,7 +2691,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
} }
} }
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; sip_contact_t * p_contact = sip->sip_contact;
int i = 0; int i = 0;
char var_name[80]; char var_name[80];