[svn-commits] alecdavis: branch 11 r372342 - in /branches/11: ./ main/dsp.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Wed Sep  5 13:46:07 2012
New Revision: 372342

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372342
Log:
dsp.c: in ast_mf_detect_init incorrectly sets goertzel samples to 160, should be MF_GSIZE

Related https://reviewboard.asterisk.org/r/2097/
........

Merged revisions 372339 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372341 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/main/dsp.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/dsp.c?view=diff&rev=372342&r1=372341&r2=372342
==============================================================================
--- branches/11/main/dsp.c (original)
+++ branches/11/main/dsp.c Wed Sep  5 13:46:07 2012
@@ -312,7 +312,6 @@
 		s->chunky++;
 		s->v3 = s->v3 >> 1;
 		s->v2 = s->v2 >> 1;
-		v1 = v1 >> 1;
 	}
 }
 
@@ -503,7 +502,7 @@
 	int i;
 	s->hits[0] = s->hits[1] = s->hits[2] = s->hits[3] = s->hits[4] = 0;
 	for (i = 0;  i < 6;  i++) {
-		goertzel_init (&s->tone_out[i], mf_tones[i], 160, sample_rate);
+		goertzel_init (&s->tone_out[i], mf_tones[i], MF_SIZE, sample_rate);
 	}
 	s->current_sample = 0;
 	s->current_hit = 0;