projects
/
fmit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 0.99.2
[fmit.git]
/
libs
/
Music
/
FreqAnalysis.cpp
diff --git
a/libs/Music/FreqAnalysis.cpp
b/libs/Music/FreqAnalysis.cpp
index
ed526dc
..
2bbb4f2
100644
(file)
--- a/
libs/Music/FreqAnalysis.cpp
+++ b/
libs/Music/FreqAnalysis.cpp
@@
-133,9
+133,6
@@
namespace Music
double FundFreqRefinementOfHarmonicStruct(const vector<complex<double> >& spectrum, double approx_f0, int nb_harm, double used_zp)
{
double FundFreqRefinementOfHarmonicStruct(const vector<complex<double> >& spectrum, double approx_f0, int nb_harm, double used_zp)
{
- double approx_f0_rel = approx_f0*spectrum.size()/double(GetSamplingRate());
- assert(approx_f0_rel>1 && approx_f0_rel<=spectrum.size()/2-1);
-
vector<Harmonic> harms = GetHarmonicStruct(spectrum, approx_f0, nb_harm, used_zp, 0.2);
if(harms.empty())
vector<Harmonic> harms = GetHarmonicStruct(spectrum, approx_f0, nb_harm, used_zp, 0.2);
if(harms.empty())
@@
-144,7
+141,7
@@
namespace Music
double sum_f0 = 0.0;
for(size_t i=0; i<harms.size(); i++)
double sum_f0 = 0.0;
for(size_t i=0; i<harms.size(); i++)
- sum_f0 += harms[i].freq/harms[i].harm_number; // TODO mod weigthed ???
+ sum_f0 += harms[i].freq/harms[i].harm_number; // TODO mod weigthed ???
return sum_f0/harms.size();
}
return sum_f0/harms.size();
}