Commit 4612f6a4 authored by aymeric's avatar aymeric
Browse files

cleanup code

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@397 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 8545df07
...@@ -408,18 +408,7 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -408,18 +408,7 @@ static void conf_sum(MSFilter *f, ConfState *s){
if (s->enable_halfduplex>0) if (s->enable_halfduplex>0)
{ {
double mystat = powerspectrum_stat_beyond8K(chan); powerspectrum_stat_beyond8K(chan);
#if 0
if (mystat>12)
{
ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, mystat);
s->channels[0].is_speaking=20; /* keep RTP unmuted for the next few ms */
}
else
{
s->channels[0].is_speaking--;
}
#else
if (chan->average_psd>s->vad_prob_start) if (chan->average_psd>s->vad_prob_start)
{ {
ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, chan->average_psd); ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, chan->average_psd);
...@@ -429,9 +418,7 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -429,9 +418,7 @@ static void conf_sum(MSFilter *f, ConfState *s){
{ {
s->channels[0].is_speaking--; s->channels[0].is_speaking--;
} }
#endif
} }
} }
else if (chan->speex_pp!=NULL && s->enable_vad==TRUE) else if (chan->speex_pp!=NULL && s->enable_vad==TRUE)
{ {
......
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