annotate dsp/keydetection/GetKeyMode.cpp @ 461:9414df58fd0e

Fix an issue is a mutithreading context The global profile buffers where used concurrently by different threads leading to wrong detection results. This is fixed by using a local copy of the buffers. In addition, this commit also includes some minor performance improvements.
author Daniel Schürmann <daschuer@mixxx.org>
date Fri, 24 May 2019 21:40:47 +0200
parents 02cb97d2dee8
children 0076c66d2932
rev   line source
c@259 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@378 2 /*
c@378 3 Copyright (c) 2005 Centre for Digital Music ( C4DM )
c@378 4 Queen Mary Univesrity of London
c@259 5
c@378 6 This program is free software; you can redistribute it and/or
c@378 7 modify it under the terms of the GNU General Public License as
c@378 8 published by the Free Software Foundation; either version 2 of the
c@378 9 License, or (at your option) any later version. See the file
c@378 10 COPYING included with this distribution for more information.
c@378 11 */
c@232 12 // GetKeyMode.cpp: implementation of the CGetKeyMode class.
c@232 13 //
c@232 14 //////////////////////////////////////////////////////////////////////
c@232 15
c@232 16 #include "GetKeyMode.h"
c@241 17 #include "maths/MathUtilities.h"
c@234 18 #include "base/Pitch.h"
c@234 19
c@234 20 #include <iostream>
c@232 21
c@272 22 #include <cstring>
c@272 23 #include <cstdlib>
c@272 24
daschuer@458 25 static const int kBinsPerOctave = 36;
daschuer@458 26
c@232 27 // Chords profile
daschuer@458 28 static double MajProfile[kBinsPerOctave] = {
daschuer@457 29 0.0384, 0.0629, 0.0258, 0.0121, 0.0146, 0.0106, 0.0364, 0.0610, 0.0267,
daschuer@457 30 0.0126, 0.0121, 0.0086, 0.0364, 0.0623, 0.0279, 0.0275, 0.0414, 0.0186,
daschuer@457 31 0.0173, 0.0248, 0.0145, 0.0364, 0.0631, 0.0262, 0.0129, 0.0150, 0.0098,
daschuer@457 32 0.0312, 0.0521, 0.0235, 0.0129, 0.0142, 0.0095, 0.0289, 0.0478, 0.0239};
c@232 33
daschuer@458 34 static double MinProfile[kBinsPerOctave] = {
daschuer@457 35 0.0375, 0.0682, 0.0299, 0.0119, 0.0138, 0.0093, 0.0296, 0.0543, 0.0257,
daschuer@457 36 0.0292, 0.0519, 0.0246, 0.0159, 0.0234, 0.0135, 0.0291, 0.0544, 0.0248,
daschuer@457 37 0.0137, 0.0176, 0.0104, 0.0352, 0.0670, 0.0302, 0.0222, 0.0349, 0.0164,
daschuer@457 38 0.0174, 0.0297, 0.0166, 0.0222, 0.0401, 0.0202, 0.0175, 0.0270, 0.0146};
c@232 39 //
c@265 40
c@232 41
c@232 42 //////////////////////////////////////////////////////////////////////
c@232 43 // Construction/Destruction
c@232 44 //////////////////////////////////////////////////////////////////////
c@232 45
c@234 46 GetKeyMode::GetKeyMode( int sampleRate, float tuningFrequency,
daschuer@457 47 double hpcpAverage, double medianAverage ) :
c@259 48 m_hpcpAverage( hpcpAverage ),
c@259 49 m_medianAverage( medianAverage ),
c@259 50 m_ChrPointer(0),
c@259 51 m_DecimatedBuffer(0),
c@259 52 m_ChromaBuffer(0),
c@259 53 m_MeanHPCP(0),
c@259 54 m_MajCorr(0),
c@259 55 m_MinCorr(0),
c@259 56 m_MedianFilterBuffer(0),
c@265 57 m_SortedBuffer(0),
c@265 58 m_keyStrengths(0)
c@232 59 {
c@259 60 m_DecimationFactor = 8;
c@259 61
c@259 62 // Chromagram configuration parameters
c@259 63 m_ChromaConfig.normalise = MathUtilities::NormaliseUnitMax;
daschuer@461 64 m_ChromaConfig.FS = sampleRate/(double)m_DecimationFactor;
daschuer@457 65 if (m_ChromaConfig.FS < 1) {
daschuer@457 66 m_ChromaConfig.FS = 1;
daschuer@457 67 }
c@232 68
daschuer@461 69 // Set C3 (= MIDI #48) as our base:
c@259 70 // This implies that key = 1 => Cmaj, key = 12 => Bmaj, key = 13 => Cmin, etc.
daschuer@457 71 m_ChromaConfig.min = Pitch::getFrequencyForPitch( 48, 0, tuningFrequency );
daschuer@457 72 m_ChromaConfig.max = Pitch::getFrequencyForPitch( 96, 0, tuningFrequency );
c@234 73
daschuer@458 74 m_ChromaConfig.BPO = kBinsPerOctave;
c@259 75 m_ChromaConfig.CQThresh = 0.0054;
c@234 76
c@259 77 // Chromagram inst.
c@259 78 m_Chroma = new Chromagram( m_ChromaConfig );
c@235 79
c@259 80 // Get calculated parameters from chroma object
c@259 81 m_ChromaFrameSize = m_Chroma->getFrameSize();
c@259 82 // override hopsize for this application
c@259 83 m_ChromaHopSize = m_ChromaFrameSize;
c@235 84
c@265 85 // std::cerr << "chroma frame size = " << m_ChromaFrameSize << ", decimation factor = " << m_DecimationFactor << " therefore block size = " << getBlockSize() << std::endl;
c@265 86
c@259 87 // Chromagram average and estimated key median filter lengths
c@259 88 m_ChromaBuffersize = (int)ceil( m_hpcpAverage * m_ChromaConfig.FS/m_ChromaFrameSize );
c@259 89 m_MedianWinsize = (int)ceil( m_medianAverage * m_ChromaConfig.FS/m_ChromaFrameSize );
c@259 90
c@259 91 // Reset counters
c@259 92 m_bufferindex = 0;
c@259 93 m_ChromaBufferFilling = 0;
c@259 94 m_MedianBufferFilling = 0;
c@234 95
c@259 96 // Spawn objectc/arrays
c@259 97 m_DecimatedBuffer = new double[m_ChromaFrameSize];
c@259 98
daschuer@458 99 m_ChromaBuffer = new double[kBinsPerOctave * m_ChromaBuffersize];
daschuer@458 100 memset( m_ChromaBuffer, 0, sizeof(double) * kBinsPerOctave * m_ChromaBuffersize);
c@259 101
daschuer@458 102 m_MeanHPCP = new double[kBinsPerOctave];
c@259 103
daschuer@458 104 m_MajCorr = new double[kBinsPerOctave];
daschuer@458 105 m_MinCorr = new double[kBinsPerOctave];
c@259 106
daschuer@461 107 m_MajProfileNorm = new double[kBinsPerOctave];
daschuer@461 108 m_MinProfileNorm = new double[kBinsPerOctave];
daschuer@461 109
daschuer@461 110 double mMaj = MathUtilities::mean( MajProfile, kBinsPerOctave );
daschuer@461 111 double mMin = MathUtilities::mean( MinProfile, kBinsPerOctave );
daschuer@461 112
daschuer@461 113 for( unsigned int i = 0; i < kBinsPerOctave; i++ ) {
daschuer@461 114 m_MajProfileNorm[i] = MajProfile[i] - mMaj;
daschuer@461 115 m_MinProfileNorm[i] = MinProfile[i] - mMin;
daschuer@461 116 }
daschuer@461 117
c@259 118 m_MedianFilterBuffer = new int[ m_MedianWinsize ];
c@259 119 memset( m_MedianFilterBuffer, 0, sizeof(int)*m_MedianWinsize);
c@259 120
c@259 121 m_SortedBuffer = new int[ m_MedianWinsize ];
daschuer@457 122 memset( m_SortedBuffer, 0, sizeof(int)*m_MedianWinsize);
c@259 123
daschuer@457 124 m_Decimator = new Decimator( m_ChromaFrameSize*m_DecimationFactor, m_DecimationFactor );
c@265 125
c@265 126 m_keyStrengths = new double[24];
c@232 127 }
c@232 128
c@232 129 GetKeyMode::~GetKeyMode()
c@232 130 {
c@259 131 delete m_Chroma;
c@259 132 delete m_Decimator;
c@259 133
c@259 134 delete [] m_DecimatedBuffer;
c@259 135 delete [] m_ChromaBuffer;
c@259 136 delete [] m_MeanHPCP;
c@259 137 delete [] m_MajCorr;
c@259 138 delete [] m_MinCorr;
daschuer@461 139 delete [] m_MajProfileNorm;
daschuer@461 140 delete [] m_MinProfileNorm;
c@259 141 delete [] m_MedianFilterBuffer;
c@259 142 delete [] m_SortedBuffer;
daschuer@460 143 delete [] m_keyStrengths;
c@232 144 }
c@232 145
daschuer@461 146 double GetKeyMode::krumCorr( const double *pDataNorm, const double *pProfileNorm,
daschuer@461 147 int shiftProfile, unsigned int length)
c@232 148 {
c@259 149 double retVal= 0.0;
c@259 150
c@259 151 double num = 0;
c@259 152 double den = 0;
c@259 153 double sum1 = 0;
c@259 154 double sum2 = 0;
c@259 155
daschuer@461 156 for( unsigned int i = 0; i <length; i++ )
daschuer@461 157 {
daschuer@461 158 int k = (i - shiftProfile + length) % length;
c@232 159
daschuer@461 160 num += pDataNorm[i] * pProfileNorm[k];
daschuer@461 161
daschuer@461 162 sum1 += ( pDataNorm[i] * pDataNorm[i] );
daschuer@461 163 sum2 += ( pProfileNorm[k] * pProfileNorm[k] );
c@259 164 }
daschuer@461 165
c@259 166 den = sqrt(sum1 * sum2);
daschuer@457 167
daschuer@457 168 if( den>0 ) {
c@259 169 retVal = num/den;
daschuer@457 170 } else {
c@259 171 retVal = 0;
daschuer@457 172 }
c@232 173
c@259 174 return retVal;
c@232 175 }
c@232 176
c@232 177 int GetKeyMode::process(double *PCMData)
c@232 178 {
c@259 179 int key;
c@259 180 unsigned int j,k;
c@232 181
c@259 182 //////////////////////////////////////////////
c@259 183 m_Decimator->process( PCMData, m_DecimatedBuffer);
c@232 184
daschuer@457 185 m_ChrPointer = m_Chroma->process( m_DecimatedBuffer );
c@232 186
c@248 187 /*
c@298 188 std::cout << "raw chroma: ";
daschuer@458 189 for (int ii = 0; ii < kBinsPerOctave; ++ii) {
daschuer@458 190 if (ii % (kBinsPerOctave/12) == 0) std::cout << "\n";
c@298 191 std::cout << m_ChrPointer[ii] << " ";
c@298 192 }
c@298 193 std::cout << std::endl;
c@248 194 */
c@259 195 // populate hpcp values;
c@259 196 int cbidx;
daschuer@458 197 for( j = 0; j < kBinsPerOctave; j++ ) {
daschuer@458 198 cbidx = (m_bufferindex * kBinsPerOctave) + j;
c@259 199 m_ChromaBuffer[ cbidx ] = m_ChrPointer[j];
c@259 200 }
c@232 201
c@259 202 //keep track of input buffers;
daschuer@457 203 if( m_bufferindex++ >= m_ChromaBuffersize - 1) {
c@259 204 m_bufferindex = 0;
daschuer@457 205 }
c@232 206
c@259 207 // track filling of chroma matrix
daschuer@457 208 if( m_ChromaBufferFilling++ >= m_ChromaBuffersize) {
c@259 209 m_ChromaBufferFilling = m_ChromaBuffersize;
daschuer@457 210 }
c@232 211
daschuer@457 212 //calculate mean
daschuer@458 213 for( k = 0; k < kBinsPerOctave; k++ ) {
c@259 214 double mnVal = 0.0;
daschuer@457 215 for( j = 0; j < m_ChromaBufferFilling; j++ ) {
daschuer@458 216 mnVal += m_ChromaBuffer[ k + (j*kBinsPerOctave) ];
c@259 217 }
c@232 218
c@259 219 m_MeanHPCP[k] = mnVal/(double)m_ChromaBufferFilling;
c@259 220 }
c@232 221
daschuer@461 222 // Normalize for zero average
daschuer@461 223 double mHPCP = MathUtilities::mean( m_MeanHPCP, kBinsPerOctave );
daschuer@461 224 for( k = 0; k < kBinsPerOctave; k++ )
daschuer@461 225 {
daschuer@461 226 m_MeanHPCP[k] -= mHPCP;
daschuer@461 227 }
c@232 228
c@232 229
daschuer@461 230 for( k = 0; k < kBinsPerOctave; k++ )
daschuer@461 231 {
daschuer@461 232 // The Cromagram has the center of C at bin 0, while the major
daschuer@461 233 // and minor profiles have the center of C at 1. We want to have
daschuer@461 234 // the correlation for C result also at 1.
daschuer@461 235 // To achieve this we have to shift two times:
daschuer@461 236 m_MajCorr[k] = krumCorr( m_MeanHPCP, m_MajProfileNorm, (int)k - 2, kBinsPerOctave );
daschuer@461 237 m_MinCorr[k] = krumCorr( m_MeanHPCP, m_MinProfileNorm, (int)k - 2, kBinsPerOctave );
c@259 238 }
daschuer@457 239
c@248 240 /*
c@259 241 std::cout << "raw keys: ";
daschuer@460 242 for (int ii = 0; ii < kBinsPerOctave; ++ii) {
daschuer@458 243 if (ii % (kBinsPerOctave/12) == 0) std::cout << "\n";
daschuer@460 244 std::cout << m_MajCorr[ii] << " ";
daschuer@460 245 }
daschuer@460 246 for (int ii = 0; ii < kBinsPerOctave; ++ii) {
daschuer@460 247 if (ii % (kBinsPerOctave/12) == 0) std::cout << "\n";
daschuer@460 248 std::cout << m_MinCorr[ii] << " ";
c@298 249 }
c@298 250 std::cout << std::endl;
daschuer@459 251 */
c@298 252
daschuer@460 253 // m_MajCorr[1] is C center 1 / 3 + 1 = 1
daschuer@460 254 // m_MajCorr[4] is D center 4 / 3 + 1 = 2
daschuer@456 255 // '+ 1' because we number keys 1-24, not 0-23.
daschuer@460 256 double maxMaj;
daschuer@460 257 int maxMajBin = MathUtilities::getMax( m_MajCorr, kBinsPerOctave, &maxMaj );
daschuer@460 258 double maxMin;
daschuer@460 259 int maxMinBin = MathUtilities::getMax( m_MinCorr, kBinsPerOctave, &maxMin );
daschuer@460 260 int maxBin = (maxMaj > maxMin) ? maxMajBin : (maxMinBin + kBinsPerOctave);
daschuer@460 261 key = maxBin / 3 + 1;
c@234 262
daschuer@460 263 // std::cout << "fractional key pre-sorting: " << (maxBin + 2) / 3.0 << std::endl;
c@298 264 // std::cout << "key pre-sorting: " << key << std::endl;
c@232 265
c@232 266
c@259 267 //Median filtering
c@232 268
c@259 269 // track Median buffer initial filling
daschuer@457 270 if( m_MedianBufferFilling++ >= m_MedianWinsize) {
c@259 271 m_MedianBufferFilling = m_MedianWinsize;
daschuer@457 272 }
daschuer@457 273
c@259 274 //shift median buffer
daschuer@457 275 for( k = 1; k < m_MedianWinsize; k++ ) {
c@259 276 m_MedianFilterBuffer[ k - 1 ] = m_MedianFilterBuffer[ k ];
c@259 277 }
c@232 278
c@259 279 //write new key value into median buffer
c@259 280 m_MedianFilterBuffer[ m_MedianWinsize - 1 ] = key;
c@232 281
c@232 282
c@259 283 //Copy median into sorting buffer, reversed
c@259 284 unsigned int ijx = 0;
daschuer@457 285 for( k = 0; k < m_MedianWinsize; k++ ) {
c@259 286 m_SortedBuffer[k] = m_MedianFilterBuffer[m_MedianWinsize-1-ijx];
c@259 287 ijx++;
c@259 288 }
c@232 289
c@259 290 qsort(m_SortedBuffer, m_MedianBufferFilling, sizeof(unsigned int),
c@259 291 MathUtilities::compareInt);
c@259 292 /*
c@259 293 std::cout << "sorted: ";
c@259 294 for (int ii = 0; ii < m_MedianBufferFilling; ++ii) {
c@259 295 std::cout << m_SortedBuffer[ii] << " ";
c@259 296 }
c@259 297 std::cout << std::endl;
c@259 298 */
c@259 299 int sortlength = m_MedianBufferFilling;
c@259 300 int midpoint = (int)ceil((double)sortlength/2);
c@232 301
c@298 302 // std::cout << "midpoint = " << midpoint << endl;
c@298 303
daschuer@457 304 if( midpoint <= 0 ) {
c@259 305 midpoint = 1;
daschuer@457 306 }
c@232 307
c@259 308 key = m_SortedBuffer[midpoint-1];
c@232 309
c@298 310 // std::cout << "returning key = " << key << endl;
c@298 311
c@259 312 return key;
c@232 313 }
c@232 314
c@232 315
c@268 316 bool GetKeyMode::isModeMinor( int key )
c@232 317 {
c@259 318 return (key > 12);
c@232 319 }
daschuer@458 320
daschuer@458 321 unsigned int getChromaSize()
daschuer@458 322 {
daschuer@458 323 return kBinsPerOctave;
daschuer@458 324 }
daschuer@459 325
daschuer@459 326 double* GetKeyMode::getKeyStrengths() {
daschuer@459 327 unsigned int k;
daschuer@459 328
daschuer@459 329 for (k = 0; k < 24; ++k) {
daschuer@459 330 m_keyStrengths[k] = 0;
daschuer@459 331 }
daschuer@459 332
daschuer@459 333 for( k = 0; k < kBinsPerOctave; k++ )
daschuer@459 334 {
daschuer@459 335 int idx = k / (kBinsPerOctave/12);
daschuer@459 336 int rem = k % (kBinsPerOctave/12);
daschuer@459 337 if (rem == 0 || m_MajCorr[k] > m_keyStrengths[idx]) {
daschuer@459 338 m_keyStrengths[idx] = m_MajCorr[k];
daschuer@459 339 }
daschuer@459 340 }
daschuer@459 341
daschuer@459 342 for( k = 0; k < kBinsPerOctave; k++ )
daschuer@459 343 {
daschuer@459 344 int idx = (k + kBinsPerOctave) / (kBinsPerOctave/12);
daschuer@459 345 int rem = k % (kBinsPerOctave/12);
daschuer@459 346 if (rem == 0 || m_MinCorr[k] > m_keyStrengths[idx]) {
daschuer@459 347 m_keyStrengths[idx] = m_MinCorr[k];
daschuer@459 348 }
daschuer@459 349 }
daschuer@459 350
daschuer@459 351 /*
daschuer@459 352 std::cout << "key strengths: ";
daschuer@459 353 for (int ii = 0; ii < 24; ++ii) {
daschuer@459 354 if (ii % 6 == 0) std::cout << "\n";
daschuer@459 355 std::cout << m_keyStrengths[ii] << " ";
daschuer@459 356 }
daschuer@459 357 std::cout << std::endl;
daschuer@459 358 */
daschuer@459 359
daschuer@459 360 return m_keyStrengths;
daschuer@459 361 }