@@ -67,34 +67,34 @@ void AudioToneDetector::notify(int32_t* data, size_t size)
6767 if (((EPSILON < m_targetFreq) || (-EPSILON > m_targetFreq)) &&
6868 (nullptr != data))
6969 {
70- size_t index = 0U ;
71- float q0 = 0 .0F ;
72- float q1 = 0 .0F ;
73- float q2 = 0 .0F ;
74- float realValue = 0 .0F ;
75- float imagValue = 0 .0F ;
76- float magnitude = 0 .0F ;
77- float scalingFactor = static_cast <float >(size) / 2 .0F ;
78-
79- while (size > index)
70+ size_t index = 0U ;
71+ float q0 = 0 .0F ;
72+ float q1 = 0 .0F ;
73+ float q2 = 0 .0F ;
74+ float realValue = 0 .0F ;
75+ float imagValue = 0 .0F ;
76+ float magnitude = 0 .0F ;
77+ float scalingFactor = static_cast <float >(size) / 2 .0F ;
78+
79+ while (size > index)
8080 {
8181 float fData = static_cast <float >(data[index]);
8282
83- q0 = m_coeff * q1 - q2 + applyHanningWindow (fData , index, AudioDrv::SAMPLES);
84- q2 = q1;
85- q1 = q0;
83+ q0 = m_coeff * q1 - q2 + applyHanningWindow (fData , index, AudioDrv::SAMPLES);
84+ q2 = q1;
85+ q1 = q0;
8686
8787 ++index;
8888 }
8989
90- realValue = q1 - q2 * m_cosValue;
90+ realValue = q1 - q2 * m_cosValue;
9191 realValue /= scalingFactor;
9292
93- imagValue = q2 * m_sinValue;
93+ imagValue = q2 * m_sinValue;
9494 imagValue /= scalingFactor;
9595
96- magnitude = sqrtf (realValue * realValue + imagValue * imagValue);
97- magnitude = applyHanningMagnitudeCorrection (magnitude);
96+ magnitude = sqrtf (realValue * realValue + imagValue * imagValue);
97+ magnitude = applyHanningMagnitudeCorrection (magnitude);
9898
9999 if (m_threshold < magnitude)
100100 {
@@ -137,23 +137,23 @@ void AudioToneDetector::notify(int32_t* data, size_t size)
137137
138138void AudioToneDetector::preCompute ()
139139{
140- float fIndex = 0 .5F + ((AudioDrv::SAMPLES * m_targetFreq) / AudioDrv::SAMPLE_RATE);
141- uint32_t index = static_cast <uint32_t >(fIndex );
140+ float fIndex = 0 .5F + ((AudioDrv::SAMPLES * m_targetFreq) / AudioDrv::SAMPLE_RATE);
141+ uint32_t index = static_cast <uint32_t >(fIndex );
142142
143- m_omega = (2 .0F * M_PI) / AudioDrv::SAMPLES;
144- m_omega *= index;
143+ m_omega = (2 .0F * M_PI) / AudioDrv::SAMPLES;
144+ m_omega *= index;
145145
146- m_cosValue = cos (m_omega);
147- m_sinValue = sin (m_omega);
146+ m_cosValue = cos (m_omega);
147+ m_sinValue = sin (m_omega);
148148
149- m_coeff = 2 .0F * m_cosValue;
149+ m_coeff = 2 .0F * m_cosValue;
150150}
151151
152152float AudioToneDetector::applyHanningWindow (float data, uint32_t sampleIndex, uint32_t samples)
153153{
154154 float fSamples = static_cast <float >(samples);
155155
156- return data * (0 .54F - 0 .46F * cos ( 2 .0F * M_PI * sampleIndex / fSamples ));
156+ return data * (0 .54F - 0 .46F * cos (2 .0F * M_PI * sampleIndex / fSamples ));
157157}
158158
159159float AudioToneDetector::applyHanningMagnitudeCorrection (float data)
0 commit comments