Mercurial > hg > qm-dsp
comparison dsp/mfcc/MFCC.cpp @ 482:cbe668c7d724
Untabify, indent, tidy
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Fri, 31 May 2019 11:02:28 +0100 |
parents | 9c8ee77db9de |
children |
comparison
equal
deleted
inserted
replaced
481:de5f557a270f | 482:cbe668c7d724 |
---|---|
234 double tmp = 0.0; | 234 double tmp = 0.0; |
235 for (j = 0; j < fftSize/2; j++) { | 235 for (j = 0; j < fftSize/2; j++) { |
236 tmp = tmp + (mfccFilterWeights[i][j] * fftMag[j]); | 236 tmp = tmp + (mfccFilterWeights[i][j] * fftMag[j]); |
237 } | 237 } |
238 if (tmp > 0) earMag[i] = log10(tmp); | 238 if (tmp > 0) earMag[i] = log10(tmp); |
239 else earMag[i] = 0.0; | 239 else earMag[i] = 0.0; |
240 | 240 |
241 if (logPower != 1.0) { | 241 if (logPower != 1.0) { |
242 earMag[i] = pow(earMag[i], logPower); | 242 earMag[i] = pow(earMag[i], logPower); |
243 } | 243 } |
244 } | 244 } |
257 for (j = 0; j < totalFilters; j++){ | 257 for (j = 0; j < totalFilters; j++){ |
258 tmp = tmp + mfccDCTMatrix[i][j] * earMag[j]; | 258 tmp = tmp + mfccDCTMatrix[i][j] * earMag[j]; |
259 } | 259 } |
260 outceps[i] = tmp; | 260 outceps[i] = tmp; |
261 } | 261 } |
262 } | 262 } else { |
263 else | |
264 { | |
265 for (i = 1; i < nceps+1; i++) { | 263 for (i = 1; i < nceps+1; i++) { |
266 double tmp = 0.; | 264 double tmp = 0.; |
267 for (j = 0; j < totalFilters; j++){ | 265 for (j = 0; j < totalFilters; j++){ |
268 tmp = tmp + mfccDCTMatrix[i][j] * earMag[j]; | 266 tmp = tmp + mfccDCTMatrix[i][j] * earMag[j]; |
269 } | 267 } |