Commit 2f77430b authored by aymeric's avatar aymeric

fix unix file mode

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@317 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 79aacdc9
...@@ -105,8 +105,8 @@ static void channel_init(ConfState *s, Channel *chan, int pos){ ...@@ -105,8 +105,8 @@ static void channel_init(ConfState *s, Channel *chan, int pos){
val=1; val=1;
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_DENOISE, &val); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_DENOISE, &val);
val = -30; val = -30;
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &val); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &val);
/* enable VAD only on incoming RTP stream */ /* enable VAD only on incoming RTP stream */
val=0; val=0;
...@@ -118,9 +118,9 @@ static void channel_init(ConfState *s, Channel *chan, int pos){ ...@@ -118,9 +118,9 @@ static void channel_init(ConfState *s, Channel *chan, int pos){
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_VAD, &val); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_VAD, &val);
if (s->vad_prob_start>0 && s->vad_prob_continue>0) if (s->vad_prob_start>0 && s->vad_prob_continue>0)
{ {
val = s->vad_prob_start; // xx% val = s->vad_prob_start; // xx%
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_START, &val); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_START, &val);
val = s->vad_prob_continue; // xx% val = s->vad_prob_continue; // xx%
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &val); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &val);
} }
...@@ -289,15 +289,15 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -289,15 +289,15 @@ static void conf_sum(MSFilter *f, ConfState *s){
&& ms_bufferizer_get_avail(&chan->buff)> s->conf_gran && ms_bufferizer_get_avail(&chan->buff)> s->conf_gran
&& ms_bufferizer_get_avail(&chan->buff)> (ms_bufferizer_get_avail(&s->channels[0].buff)+s->conf_gran*6) ) && ms_bufferizer_get_avail(&chan->buff)> (ms_bufferizer_get_avail(&s->channels[0].buff)+s->conf_gran*6) )
{ {
#if 0 #if 0
int loudness; int loudness;
#endif #endif
int vad=0; int vad=0;
while (ms_bufferizer_get_avail(&chan->buff)> (ms_bufferizer_get_avail(&s->channels[0].buff)) ) while (ms_bufferizer_get_avail(&chan->buff)> (ms_bufferizer_get_avail(&s->channels[0].buff)) )
{ {
ms_bufferizer_read(&chan->buff,(uint8_t*)chan->input,s->conf_gran); ms_bufferizer_read(&chan->buff,(uint8_t*)chan->input,s->conf_gran);
#if 0 #if 0
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness);
#endif #endif
/* we want to remove 4 packets (40ms) in a near future: */ /* we want to remove 4 packets (40ms) in a near future: */
#ifndef DISABLE_SPEEX #ifndef DISABLE_SPEEX
...@@ -321,7 +321,7 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -321,7 +321,7 @@ static void conf_sum(MSFilter *f, ConfState *s){
if (s->enable_halfduplex>0) if (s->enable_halfduplex>0)
{ {
#if 0 #if 0
ms_message("prob=%i", loudness); ms_message("prob=%i", loudness);
#endif #endif
// LIMITATION: // LIMITATION:
...@@ -366,15 +366,15 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -366,15 +366,15 @@ static void conf_sum(MSFilter *f, ConfState *s){
} }
else if (chan->speex_pp!=NULL && s->enable_vad==TRUE) else if (chan->speex_pp!=NULL && s->enable_vad==TRUE)
{ {
#if 0 #if 0
int loudness; int loudness;
#endif #endif
int vad; int vad;
if (s->enable_halfduplex>0) if (s->enable_halfduplex>0)
{ {
vad = speex_preprocess(chan->speex_pp, (short*)chan->input, NULL); vad = speex_preprocess(chan->speex_pp, (short*)chan->input, NULL);
#if 0 #if 0
speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness); speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness);
ms_message("prob=%i", loudness); ms_message("prob=%i", loudness);
#endif #endif
// LIMITATION: // LIMITATION:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment