Mercurial > hg > vamp-fanchirp
changeset 18:3835e03650cc spect
Change calculation of frequency index based on the usual FFT bin frequencies. I'm troubled by this change, but it does appear to produce the correct result.
| author | Chris Cannam |
|---|---|
| date | Thu, 04 Oct 2018 10:17:32 +0100 |
| parents | 436eab0bc1ff |
| children | d7fbd446f47f |
| files | FChTransformF0gram.cpp |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/FChTransformF0gram.cpp Thu Oct 04 09:46:30 2018 +0100 +++ b/FChTransformF0gram.cpp Thu Oct 04 10:17:32 2018 +0100 @@ -615,11 +615,7 @@ double aux_pos; for (int i = 0; i < m_glogs_num_f0s; i++) { for (int j = 1; j <= m_glogs_n[i]; j++) { - // indice en el vector de largo t_warp/2+1 donde el ultimo valor corresponde a f=m_fmax - aux_pos = ((double)j*m_glogs_f0[i])*((double)(m_warp_params.nsamps_twarp/2+1))/m_fmax; -//!!! cerr << "aux_pos = " << aux_pos << endl; -// aux_pos = ((double)j*m_glogs_f0[i])*((double)(m_warp_params.nsamps_twarp/2+1))/m_warpings.fs_warp; -// cerr << "or " << aux_pos << " (as fs_warp = " << m_warpings.fs_warp << ")" << endl; + aux_pos = ((double)j * m_glogs_f0[i]) * ((double)(m_warp_params.nsamps_twarp))/m_warpings.fs_warp; m_glogs_posint[aux_index] = (int)aux_pos; m_glogs_posfrac[aux_index] = aux_pos - (double)m_glogs_posint[aux_index]; aux_index++;