Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qm shift 1/3 #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Qm shift 1/3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4747f6f
Fix a rounding issue, during creation of sparse kernel
daschuer Jun 2, 2019
e5e9f46
start a 1/2 note earlier to have alwas both border bins of a full not…
daschuer Jun 2, 2019
d8d022d
Improve comment
daschuer Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions dsp/chromagram/ConstantQ.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@ void ConstantQ::sparsekernel()

// Compute a complex sinusoid windowed with a hamming window
// of the right length

int windowLength = (int)ceil
(m_dQ * m_FS / (m_FMin * pow(2, (double)j / (double)m_BPO)));

const double samplesPerCycle =
m_FS / (m_FMin * pow(2, (double)j / (double)m_BPO));
int windowLength = (int)ceil(m_dQ * samplesPerCycle);

int origin = m_FFTLength/2 - windowLength/2;

for (int i = 0; i < windowLength; ++i) {
double angle = (2.0 * M_PI * m_dQ * i) / windowLength;
double angle = (2.0 * M_PI * i) / samplesPerCycle;
windowRe[origin + i] = cos(angle);
windowIm[origin + i] = sin(angle);
}
Expand Down
18 changes: 8 additions & 10 deletions dsp/keydetection/GetKeyMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ GetKeyMode::GetKeyMode(Config config) :

// Set C3 (= MIDI #48) as our base:
// This implies that key = 1 => Cmaj, key = 12 => Bmaj, key = 13 => Cmin, etc.
const float centsOffset = -12.0f / kBinsPerOctave * 100; // 3 bins per note, start with the first
chromaConfig.min =
Pitch::getFrequencyForPitch( 48, 0, config.tuningFrequency );
Pitch::getFrequencyForPitch( 48, centsOffset, config.tuningFrequency );
chromaConfig.max =
Pitch::getFrequencyForPitch( 96, 0, config.tuningFrequency );
Pitch::getFrequencyForPitch( 96, centsOffset, config.tuningFrequency );

chromaConfig.BPO = kBinsPerOctave;
chromaConfig.CQThresh = 0.0054;
Expand Down Expand Up @@ -232,14 +233,11 @@ int GetKeyMode::process(double *pcmData)
}

for (k = 0; k < kBinsPerOctave; k++) {
// The Chromagram has the center of C at bin 0, while the major
// and minor profiles have the center of C at 1. We want to have
// the correlation for C result also at 1.
// To achieve this we have to shift two times:
m_majCorr[k] = krumCorr
(m_meanHPCP, m_majProfileNorm, k - 2, kBinsPerOctave);
m_minCorr[k] = krumCorr
(m_meanHPCP, m_minProfileNorm, k - 2, kBinsPerOctave);
// The cromagram and the major and minor profiles have the
// center of C at bin 1. We want to have the correlation for C result
// also at 1. To achieve this we have to shift by one:
m_majCorr[k] = krumCorr(m_meanHPCP, m_majProfileNorm, (int)k - 1, kBinsPerOctave);
m_minCorr[k] = krumCorr(m_meanHPCP, m_minProfileNorm, (int)k - 1, kBinsPerOctave);
}

// m_MajCorr[1] is C center 1 / 3 + 1 = 1
Expand Down