From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Wed, 5 Sep 2012 18:43:12 +0000 (+0000)
Subject: dsp.c: in ast_mf_detect_init incorrectly sets goertzel samples to 160, should be... 
X-Git-Tag: 10.9.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70ac2c553e55031efa6fbaea0e6c4b5c6af91867;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@372341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/dsp.c b/main/dsp.c
index 7541650844..4272158ff5 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -312,7 +312,6 @@ static inline void goertzel_sample(goertzel_state_t *s, short sample)
 		s->chunky++;
 		s->v3 = s->v3 >> 1;
 		s->v2 = s->v2 >> 1;
-		v1 = v1 >> 1;
 	}
 }
 
@@ -502,7 +501,7 @@ static void ast_mf_detect_init (mf_detect_state_t *s, unsigned int sample_rate)
 	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;