annotate NNLSChroma.cpp @ 77:ba930176df5b matthiasm-plugin

fixed. warning: I added some arrays with variable length (though not at runtime).
author Matthias Mauch <mail@matthiasmauch.net>
date Thu, 11 Nov 2010 10:27:58 +0900
parents d398e73b46e0
children f50f701df33e 026a5c0ee2c2
rev   line source
Chris@23 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
matthiasm@0 2
Chris@35 3 /*
Chris@35 4 NNLS-Chroma / Chordino
Chris@35 5
Chris@35 6 Audio feature extraction plugins for chromagram and chord
Chris@35 7 estimation.
Chris@35 8
Chris@35 9 Centre for Digital Music, Queen Mary University of London.
Chris@35 10 This file copyright 2008-2010 Matthias Mauch and QMUL.
Chris@35 11
Chris@35 12 This program is free software; you can redistribute it and/or
Chris@35 13 modify it under the terms of the GNU General Public License as
Chris@35 14 published by the Free Software Foundation; either version 2 of the
Chris@35 15 License, or (at your option) any later version. See the file
Chris@35 16 COPYING included with this distribution for more information.
Chris@35 17 */
Chris@35 18
matthiasm@0 19 #include "NNLSChroma.h"
Chris@27 20
Chris@27 21 #include "chromamethods.h"
Chris@27 22
Chris@27 23 #include <cstdlib>
Chris@27 24 #include <fstream>
matthiasm@0 25 #include <cmath>
matthiasm@9 26
Chris@27 27 #include <algorithm>
matthiasm@0 28
matthiasm@0 29 const bool debug_on = false;
matthiasm@0 30
matthiasm@0 31 NNLSChroma::NNLSChroma(float inputSampleRate) :
Chris@35 32 NNLSBase(inputSampleRate)
matthiasm@0 33 {
Chris@23 34 if (debug_on) cerr << "--> NNLSChroma" << endl;
matthiasm@0 35 }
matthiasm@0 36
matthiasm@0 37 NNLSChroma::~NNLSChroma()
matthiasm@0 38 {
Chris@23 39 if (debug_on) cerr << "--> ~NNLSChroma" << endl;
matthiasm@0 40 }
matthiasm@0 41
matthiasm@0 42 string
matthiasm@0 43 NNLSChroma::getIdentifier() const
matthiasm@0 44 {
Chris@23 45 if (debug_on) cerr << "--> getIdentifier" << endl;
matthiasm@46 46 return "nnls-chroma";
matthiasm@0 47 }
matthiasm@0 48
matthiasm@0 49 string
matthiasm@0 50 NNLSChroma::getName() const
matthiasm@0 51 {
Chris@23 52 if (debug_on) cerr << "--> getName" << endl;
matthiasm@0 53 return "NNLS Chroma";
matthiasm@0 54 }
matthiasm@0 55
matthiasm@0 56 string
matthiasm@0 57 NNLSChroma::getDescription() const
matthiasm@0 58 {
Chris@23 59 if (debug_on) cerr << "--> getDescription" << endl;
matthiasm@58 60 return "This plugin provides a number of features derived from a DFT-based log-frequency amplitude spectrum: some variants of the log-frequency spectrum, including a semitone spectrum derived from approximate transcription using the NNLS algorithm; and based on this semitone spectrum, different chroma features.";
matthiasm@0 61 }
matthiasm@0 62
matthiasm@0 63 NNLSChroma::OutputList
matthiasm@0 64 NNLSChroma::getOutputDescriptors() const
matthiasm@0 65 {
Chris@23 66 if (debug_on) cerr << "--> getOutputDescriptors" << endl;
matthiasm@0 67 OutputList list;
matthiasm@0 68
matthiasm@0 69 // Make chroma names for the binNames property
matthiasm@0 70 vector<string> chromanames;
matthiasm@0 71 vector<string> bothchromanames;
matthiasm@0 72 for (int iNote = 0; iNote < 24; iNote++) {
matthiasm@0 73 bothchromanames.push_back(notenames[iNote]);
matthiasm@0 74 if (iNote < 12) {
matthiasm@43 75 chromanames.push_back(notenames[iNote+12]);
matthiasm@0 76 }
matthiasm@0 77 }
matthiasm@0 78
Chris@35 79 int index = 0;
matthiasm@0 80
Chris@23 81 OutputDescriptor d1;
matthiasm@0 82 d1.identifier = "logfreqspec";
matthiasm@0 83 d1.name = "Log-Frequency Spectrum";
matthiasm@0 84 d1.description = "A Log-Frequency Spectrum (constant Q) that is obtained by cosine filter mapping.";
matthiasm@0 85 d1.unit = "";
matthiasm@0 86 d1.hasFixedBinCount = true;
matthiasm@0 87 d1.binCount = nNote;
matthiasm@0 88 d1.hasKnownExtents = false;
matthiasm@0 89 d1.isQuantized = false;
matthiasm@0 90 d1.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 91 d1.hasDuration = false;
matthiasm@0 92 d1.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 93 list.push_back(d1);
Chris@35 94 m_outputLogSpec = index++;
matthiasm@0 95
Chris@23 96 OutputDescriptor d2;
matthiasm@0 97 d2.identifier = "tunedlogfreqspec";
matthiasm@0 98 d2.name = "Tuned Log-Frequency Spectrum";
matthiasm@0 99 d2.description = "A Log-Frequency Spectrum (constant Q) that is obtained by cosine filter mapping, then its tuned using the estimated tuning frequency.";
matthiasm@0 100 d2.unit = "";
matthiasm@0 101 d2.hasFixedBinCount = true;
mail@77 102 d2.binCount = nNote;
matthiasm@0 103 d2.hasKnownExtents = false;
matthiasm@0 104 d2.isQuantized = false;
matthiasm@0 105 d2.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 106 d2.hasDuration = false;
matthiasm@0 107 d2.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 108 list.push_back(d2);
Chris@35 109 m_outputTunedSpec = index++;
matthiasm@0 110
matthiasm@0 111 OutputDescriptor d3;
matthiasm@0 112 d3.identifier = "semitonespectrum";
matthiasm@0 113 d3.name = "Semitone Spectrum";
matthiasm@0 114 d3.description = "A semitone-spaced log-frequency spectrum derived from the third-of-a-semitone-spaced tuned log-frequency spectrum.";
matthiasm@0 115 d3.unit = "";
matthiasm@0 116 d3.hasFixedBinCount = true;
matthiasm@0 117 d3.binCount = 84;
matthiasm@0 118 d3.hasKnownExtents = false;
matthiasm@0 119 d3.isQuantized = false;
matthiasm@0 120 d3.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 121 d3.hasDuration = false;
matthiasm@0 122 d3.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 123 list.push_back(d3);
Chris@35 124 m_outputSemiSpec = index++;
matthiasm@0 125
matthiasm@0 126 OutputDescriptor d4;
matthiasm@0 127 d4.identifier = "chroma";
matthiasm@0 128 d4.name = "Chromagram";
matthiasm@58 129 d4.description = "Tuning-adjusted chromagram from NNLS approximate transcription, with an emphasis on the medium note range.";
matthiasm@0 130 d4.unit = "";
matthiasm@0 131 d4.hasFixedBinCount = true;
matthiasm@0 132 d4.binCount = 12;
matthiasm@0 133 d4.binNames = chromanames;
matthiasm@0 134 d4.hasKnownExtents = false;
matthiasm@0 135 d4.isQuantized = false;
matthiasm@0 136 d4.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 137 d4.hasDuration = false;
matthiasm@0 138 d4.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 139 list.push_back(d4);
Chris@35 140 m_outputChroma = index++;
matthiasm@0 141
matthiasm@0 142 OutputDescriptor d5;
matthiasm@0 143 d5.identifier = "basschroma";
matthiasm@0 144 d5.name = "Bass Chromagram";
matthiasm@58 145 d5.description = "Tuning-adjusted bass chromagram from NNLS approximate transcription, with an emphasis on the bass note range.";
matthiasm@0 146 d5.unit = "";
matthiasm@0 147 d5.hasFixedBinCount = true;
matthiasm@0 148 d5.binCount = 12;
matthiasm@0 149 d5.binNames = chromanames;
matthiasm@0 150 d5.hasKnownExtents = false;
matthiasm@0 151 d5.isQuantized = false;
matthiasm@0 152 d5.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 153 d5.hasDuration = false;
matthiasm@0 154 d5.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 155 list.push_back(d5);
Chris@35 156 m_outputBassChroma = index++;
matthiasm@0 157
matthiasm@0 158 OutputDescriptor d6;
matthiasm@0 159 d6.identifier = "bothchroma";
matthiasm@0 160 d6.name = "Chromagram and Bass Chromagram";
matthiasm@58 161 d6.description = "Tuning-adjusted chromagram and bass chromagram (stacked on top of each other) from NNLS approximate transcription.";
matthiasm@0 162 d6.unit = "";
matthiasm@0 163 d6.hasFixedBinCount = true;
matthiasm@0 164 d6.binCount = 24;
matthiasm@0 165 d6.binNames = bothchromanames;
matthiasm@0 166 d6.hasKnownExtents = false;
matthiasm@0 167 d6.isQuantized = false;
matthiasm@0 168 d6.sampleType = OutputDescriptor::FixedSampleRate;
matthiasm@0 169 d6.hasDuration = false;
matthiasm@0 170 d6.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
matthiasm@0 171 list.push_back(d6);
Chris@35 172 m_outputBothChroma = index++;
matthiasm@1 173
matthiasm@0 174 return list;
matthiasm@0 175 }
matthiasm@0 176
matthiasm@0 177
matthiasm@0 178 bool
matthiasm@0 179 NNLSChroma::initialise(size_t channels, size_t stepSize, size_t blockSize)
matthiasm@0 180 {
Chris@23 181 if (debug_on) {
Chris@23 182 cerr << "--> initialise";
Chris@23 183 }
matthiasm@1 184
Chris@35 185 if (!NNLSBase::initialise(channels, stepSize, blockSize)) {
Chris@35 186 return false;
Chris@35 187 }
matthiasm@1 188
matthiasm@0 189 return true;
matthiasm@0 190 }
matthiasm@0 191
matthiasm@0 192 void
matthiasm@0 193 NNLSChroma::reset()
matthiasm@0 194 {
Chris@23 195 if (debug_on) cerr << "--> reset";
Chris@35 196 NNLSBase::reset();
matthiasm@0 197 }
matthiasm@0 198
matthiasm@0 199 NNLSChroma::FeatureSet
matthiasm@0 200 NNLSChroma::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
matthiasm@0 201 {
Chris@23 202 if (debug_on) cerr << "--> process" << endl;
Chris@35 203
Chris@35 204 NNLSBase::baseProcess(inputBuffers, timestamp);
matthiasm@0 205
Chris@23 206 FeatureSet fs;
Chris@35 207 fs[m_outputLogSpec].push_back(m_logSpectrum[m_logSpectrum.size()-1]);
Chris@23 208 return fs;
matthiasm@0 209 }
matthiasm@0 210
matthiasm@0 211 NNLSChroma::FeatureSet
matthiasm@0 212 NNLSChroma::getRemainingFeatures()
matthiasm@0 213 {
Chris@23 214 if (debug_on) cerr << "--> getRemainingFeatures" << endl;
Chris@23 215 FeatureSet fsOut;
Chris@35 216 if (m_logSpectrum.size() == 0) return fsOut;
Chris@23 217 //
Chris@23 218 /** Calculate Tuning
Chris@23 219 calculate tuning from (using the angle of the complex number defined by the
Chris@23 220 cumulative mean real and imag values)
Chris@23 221 **/
Chris@23 222 float meanTuningImag = sinvalue * m_meanTuning1 - sinvalue * m_meanTuning2;
Chris@23 223 float meanTuningReal = m_meanTuning0 + cosvalue * m_meanTuning1 + cosvalue * m_meanTuning2;
Chris@23 224 float cumulativetuning = 440 * pow(2,atan2(meanTuningImag, meanTuningReal)/(24*M_PI));
Chris@23 225 float normalisedtuning = atan2(meanTuningImag, meanTuningReal)/(2*M_PI);
Chris@23 226 int intShift = floor(normalisedtuning * 3);
Chris@23 227 float intFactor = normalisedtuning * 3 - intShift; // intFactor is a really bad name for this
matthiasm@1 228
Chris@23 229 char buffer0 [50];
matthiasm@1 230
Chris@23 231 sprintf(buffer0, "estimated tuning: %0.1f Hz", cumulativetuning);
matthiasm@1 232
Chris@23 233 // cerr << "normalisedtuning: " << normalisedtuning << '\n';
matthiasm@1 234
Chris@23 235 /** Tune Log-Frequency Spectrogram
Chris@23 236 calculate a tuned log-frequency spectrogram (f2): use the tuning estimated above (kinda f0) to
Chris@23 237 perform linear interpolation on the existing log-frequency spectrogram (kinda f1).
Chris@23 238 **/
Chris@23 239 cerr << endl << "[NNLS Chroma Plugin] Tuning Log-Frequency Spectrogram ... ";
matthiasm@13 240
Chris@23 241 float tempValue = 0;
Chris@23 242 float dbThreshold = 0; // relative to the background spectrum
Chris@23 243 float thresh = pow(10,dbThreshold/20);
Chris@23 244 // cerr << "tune local ? " << m_tuneLocal << endl;
Chris@23 245 int count = 0;
mail@77 246
mail@77 247 cerr << nNote;
mail@77 248 cerr << endl << "-------------------------------------"<< endl;
matthiasm@1 249
Chris@35 250 for (FeatureList::iterator i = m_logSpectrum.begin(); i != m_logSpectrum.end(); ++i) {
Chris@23 251 Feature f1 = *i;
Chris@23 252 Feature f2; // tuned log-frequency spectrum
Chris@23 253 f2.hasTimestamp = true;
Chris@23 254 f2.timestamp = f1.timestamp;
Chris@23 255 f2.values.push_back(0.0); f2.values.push_back(0.0); // set lower edge to zero
matthiasm@1 256
Chris@23 257 if (m_tuneLocal) {
Chris@23 258 intShift = floor(m_localTuning[count] * 3);
Chris@23 259 intFactor = m_localTuning[count] * 3 - intShift; // intFactor is a really bad name for this
Chris@23 260 }
matthiasm@1 261
Chris@23 262 // cerr << intShift << " " << intFactor << endl;
matthiasm@1 263
Chris@23 264 for (unsigned k = 2; k < f1.values.size() - 3; ++k) { // interpolate all inner bins
Chris@23 265 tempValue = f1.values[k + intShift] * (1-intFactor) + f1.values[k+intShift+1] * intFactor;
Chris@23 266 f2.values.push_back(tempValue);
Chris@23 267 }
matthiasm@1 268
Chris@23 269 f2.values.push_back(0.0); f2.values.push_back(0.0); f2.values.push_back(0.0); // upper edge
mail@77 270
Chris@23 271 vector<float> runningmean = SpecialConvolution(f2.values,hw);
Chris@23 272 vector<float> runningstd;
mail@77 273 for (int i = 0; i < nNote; i++) { // first step: squared values into vector (variance)
Chris@23 274 runningstd.push_back((f2.values[i] - runningmean[i]) * (f2.values[i] - runningmean[i]));
Chris@23 275 }
Chris@23 276 runningstd = SpecialConvolution(runningstd,hw); // second step convolve
mail@77 277 for (int i = 0; i < nNote; i++) {
Chris@23 278 runningstd[i] = sqrt(runningstd[i]); // square root to finally have running std
Chris@23 279 if (runningstd[i] > 0) {
Chris@23 280 // f2.values[i] = (f2.values[i] / runningmean[i]) > thresh ?
mail@41 281 // (f2.values[i] - runningmean[i]) / pow(runningstd[i],m_whitening) : 0;
Chris@23 282 f2.values[i] = (f2.values[i] - runningmean[i]) > 0 ?
mail@41 283 (f2.values[i] - runningmean[i]) / pow(runningstd[i],m_whitening) : 0;
Chris@23 284 }
Chris@23 285 if (f2.values[i] < 0) {
Chris@23 286 cerr << "ERROR: negative value in logfreq spectrum" << endl;
Chris@23 287 }
Chris@23 288 }
Chris@35 289 fsOut[m_outputTunedSpec].push_back(f2);
Chris@23 290 count++;
Chris@23 291 }
Chris@23 292 cerr << "done." << endl;
matthiasm@1 293
Chris@23 294 /** Semitone spectrum and chromagrams
Chris@23 295 Semitone-spaced log-frequency spectrum derived from the tuned log-freq spectrum above. the spectrum
Chris@23 296 is inferred using a non-negative least squares algorithm.
Chris@23 297 Three different kinds of chromagram are calculated, "treble", "bass", and "both" (which means
Chris@23 298 bass and treble stacked onto each other).
Chris@23 299 **/
matthiasm@42 300 if (m_useNNLS == 0) {
Chris@23 301 cerr << "[NNLS Chroma Plugin] Mapping to semitone spectrum and chroma ... ";
Chris@23 302 } else {
Chris@23 303 cerr << "[NNLS Chroma Plugin] Performing NNLS and mapping to chroma ... ";
Chris@23 304 }
matthiasm@13 305
matthiasm@1 306
Chris@23 307 vector<float> oldchroma = vector<float>(12,0);
Chris@23 308 vector<float> oldbasschroma = vector<float>(12,0);
Chris@23 309 count = 0;
matthiasm@9 310
Chris@38 311 for (FeatureList::iterator it = fsOut[m_outputTunedSpec].begin(); it != fsOut[m_outputTunedSpec].end(); ++it) {
Chris@23 312 Feature f2 = *it; // logfreq spectrum
Chris@23 313 Feature f3; // semitone spectrum
Chris@23 314 Feature f4; // treble chromagram
Chris@23 315 Feature f5; // bass chromagram
Chris@23 316 Feature f6; // treble and bass chromagram
matthiasm@1 317
Chris@23 318 f3.hasTimestamp = true;
Chris@23 319 f3.timestamp = f2.timestamp;
matthiasm@1 320
Chris@23 321 f4.hasTimestamp = true;
Chris@23 322 f4.timestamp = f2.timestamp;
matthiasm@1 323
Chris@23 324 f5.hasTimestamp = true;
Chris@23 325 f5.timestamp = f2.timestamp;
matthiasm@1 326
Chris@23 327 f6.hasTimestamp = true;
Chris@23 328 f6.timestamp = f2.timestamp;
matthiasm@1 329
mail@77 330 float b[nNote];
matthiasm@1 331
Chris@23 332 bool some_b_greater_zero = false;
Chris@23 333 float sumb = 0;
mail@77 334 for (int i = 0; i < nNote; i++) {
mail@77 335 // b[i] = m_dict[(nNote * count + i) % (nNote * 84)];
Chris@23 336 b[i] = f2.values[i];
Chris@23 337 sumb += b[i];
Chris@23 338 if (b[i] > 0) {
Chris@23 339 some_b_greater_zero = true;
Chris@23 340 }
Chris@23 341 }
matthiasm@1 342
Chris@23 343 // here's where the non-negative least squares algorithm calculates the note activation x
matthiasm@1 344
Chris@23 345 vector<float> chroma = vector<float>(12, 0);
Chris@23 346 vector<float> basschroma = vector<float>(12, 0);
Chris@23 347 float currval;
Chris@23 348 unsigned iSemitone = 0;
matthiasm@1 349
Chris@23 350 if (some_b_greater_zero) {
matthiasm@42 351 if (m_useNNLS == 0) {
Chris@23 352 for (unsigned iNote = 2; iNote < nNote - 2; iNote += 3) {
Chris@23 353 currval = 0;
Chris@23 354 currval += b[iNote + 1 + -1] * 0.5;
Chris@23 355 currval += b[iNote + 1 + 0] * 1.0;
Chris@23 356 currval += b[iNote + 1 + 1] * 0.5;
Chris@23 357 f3.values.push_back(currval);
Chris@23 358 chroma[iSemitone % 12] += currval * treblewindow[iSemitone];
Chris@23 359 basschroma[iSemitone % 12] += currval * basswindow[iSemitone];
Chris@23 360 iSemitone++;
Chris@23 361 }
matthiasm@1 362
Chris@23 363 } else {
Chris@35 364 float x[84+1000];
Chris@23 365 for (int i = 1; i < 1084; ++i) x[i] = 1.0;
Chris@23 366 vector<int> signifIndex;
Chris@23 367 int index=0;
Chris@23 368 sumb /= 84.0;
Chris@23 369 for (unsigned iNote = 2; iNote < nNote - 2; iNote += 3) {
Chris@23 370 float currval = 0;
Chris@35 371 currval += b[iNote + 1 + -1];
Chris@35 372 currval += b[iNote + 1 + 0];
Chris@23 373 currval += b[iNote + 1 + 1];
Chris@23 374 if (currval > 0) signifIndex.push_back(index);
Chris@23 375 f3.values.push_back(0); // fill the values, change later
Chris@23 376 index++;
Chris@23 377 }
Chris@35 378 float rnorm;
Chris@35 379 float w[84+1000];
Chris@35 380 float zz[84+1000];
Chris@23 381 int indx[84+1000];
Chris@23 382 int mode;
mail@77 383 int dictsize = nNote*signifIndex.size();
Chris@23 384 // cerr << "dictsize is " << dictsize << "and values size" << f3.values.size()<< endl;
Chris@35 385 float *curr_dict = new float[dictsize];
Chris@23 386 for (unsigned iNote = 0; iNote < signifIndex.size(); ++iNote) {
mail@77 387 for (unsigned iBin = 0; iBin < nNote; iBin++) {
mail@77 388 curr_dict[iNote * nNote + iBin] = 1.0 * m_dict[signifIndex[iNote] * nNote + iBin];
Chris@23 389 }
Chris@23 390 }
Chris@35 391 nnls(curr_dict, nNote, nNote, signifIndex.size(), b, x, &rnorm, w, zz, indx, &mode);
Chris@23 392 delete [] curr_dict;
Chris@23 393 for (unsigned iNote = 0; iNote < signifIndex.size(); ++iNote) {
Chris@23 394 f3.values[signifIndex[iNote]] = x[iNote];
Chris@23 395 // cerr << mode << endl;
Chris@23 396 chroma[signifIndex[iNote] % 12] += x[iNote] * treblewindow[signifIndex[iNote]];
Chris@23 397 basschroma[signifIndex[iNote] % 12] += x[iNote] * basswindow[signifIndex[iNote]];
Chris@23 398 }
Chris@23 399 }
Chris@23 400 }
matthiasm@13 401
Chris@23 402 f4.values = chroma;
Chris@23 403 f5.values = basschroma;
Chris@23 404 chroma.insert(chroma.begin(), basschroma.begin(), basschroma.end()); // just stack the both chromas
Chris@23 405 f6.values = chroma;
matthiasm@1 406
Chris@23 407 if (m_doNormalizeChroma > 0) {
Chris@23 408 vector<float> chromanorm = vector<float>(3,0);
Chris@23 409 switch (int(m_doNormalizeChroma)) {
Chris@23 410 case 0: // should never end up here
Chris@23 411 break;
Chris@23 412 case 1:
Chris@23 413 chromanorm[0] = *max_element(f4.values.begin(), f4.values.end());
Chris@23 414 chromanorm[1] = *max_element(f5.values.begin(), f5.values.end());
Chris@23 415 chromanorm[2] = max(chromanorm[0], chromanorm[1]);
Chris@23 416 break;
Chris@23 417 case 2:
Chris@23 418 for (vector<float>::iterator it = f4.values.begin(); it != f4.values.end(); ++it) {
Chris@23 419 chromanorm[0] += *it;
Chris@23 420 }
Chris@23 421 for (vector<float>::iterator it = f5.values.begin(); it != f5.values.end(); ++it) {
Chris@23 422 chromanorm[1] += *it;
Chris@23 423 }
Chris@23 424 for (vector<float>::iterator it = f6.values.begin(); it != f6.values.end(); ++it) {
Chris@23 425 chromanorm[2] += *it;
Chris@23 426 }
Chris@23 427 break;
Chris@23 428 case 3:
Chris@23 429 for (vector<float>::iterator it = f4.values.begin(); it != f4.values.end(); ++it) {
Chris@23 430 chromanorm[0] += pow(*it,2);
Chris@23 431 }
Chris@23 432 chromanorm[0] = sqrt(chromanorm[0]);
Chris@23 433 for (vector<float>::iterator it = f5.values.begin(); it != f5.values.end(); ++it) {
Chris@23 434 chromanorm[1] += pow(*it,2);
Chris@23 435 }
Chris@23 436 chromanorm[1] = sqrt(chromanorm[1]);
Chris@23 437 for (vector<float>::iterator it = f6.values.begin(); it != f6.values.end(); ++it) {
Chris@23 438 chromanorm[2] += pow(*it,2);
Chris@23 439 }
Chris@23 440 chromanorm[2] = sqrt(chromanorm[2]);
Chris@23 441 break;
Chris@23 442 }
Chris@23 443 if (chromanorm[0] > 0) {
Chris@23 444 for (int i = 0; i < f4.values.size(); i++) {
Chris@23 445 f4.values[i] /= chromanorm[0];
Chris@23 446 }
Chris@23 447 }
Chris@23 448 if (chromanorm[1] > 0) {
Chris@23 449 for (int i = 0; i < f5.values.size(); i++) {
Chris@23 450 f5.values[i] /= chromanorm[1];
Chris@23 451 }
Chris@23 452 }
Chris@23 453 if (chromanorm[2] > 0) {
Chris@23 454 for (int i = 0; i < f6.values.size(); i++) {
Chris@23 455 f6.values[i] /= chromanorm[2];
Chris@23 456 }
Chris@23 457 }
Chris@23 458 }
matthiasm@13 459
Chris@35 460 fsOut[m_outputSemiSpec].push_back(f3);
Chris@35 461 fsOut[m_outputChroma].push_back(f4);
Chris@35 462 fsOut[m_outputBassChroma].push_back(f5);
Chris@35 463 fsOut[m_outputBothChroma].push_back(f6);
Chris@23 464 count++;
Chris@23 465 }
Chris@23 466 cerr << "done." << endl;
matthiasm@10 467
Chris@23 468 return fsOut;
matthiasm@0 469
matthiasm@0 470 }
matthiasm@0 471