Mercurial > hg > qm-vamp-plugins
changeset 16:2fbfe5e42ad4
* Avoid NaNs in output values
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Fri, 13 Oct 2006 12:28:44 +0000 |
| parents | 3b02e26b23ff |
| children | d4a92aab8147 |
| files | plugins/ChromagramPlugin.cpp plugins/ConstantQSpectrogram.cpp qm-vamp-plugins.pro |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/ChromagramPlugin.cpp Thu Oct 05 15:50:30 2006 +0000 +++ b/plugins/ChromagramPlugin.cpp Fri Oct 13 12:28:44 2006 +0000 @@ -336,7 +336,9 @@ Feature feature; feature.hasTimestamp = false; for (size_t i = 0; i < m_config.BPO; ++i) { - feature.values.push_back(output[i]); + double value = output[i]; + if (isnan(value)) value = 0.0; + feature.values.push_back(value); } feature.label = "";
--- a/plugins/ConstantQSpectrogram.cpp Thu Oct 05 15:50:30 2006 +0000 +++ b/plugins/ConstantQSpectrogram.cpp Fri Oct 13 12:28:44 2006 +0000 @@ -338,8 +338,12 @@ Feature feature; feature.hasTimestamp = false; for (size_t i = 0; i < m_bins; ++i) { - feature.values.push_back(sqrt(cqre[i] * cqre[i] + - cqim[i] * cqim[i])); + double re = cqre[i]; + double im = cqim[i]; + if (isnan(re)) re = 0.0; + if (isnan(im)) im = 0.0; + double value = sqrt(re * re + im * im); + feature.values.push_back(value); } feature.label = "";
--- a/qm-vamp-plugins.pro Thu Oct 05 15:50:30 2006 +0000 +++ b/qm-vamp-plugins.pro Fri Oct 13 12:28:44 2006 +0000 @@ -12,7 +12,7 @@ INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp -LIBS += -lqm-dsp -lvamp-sdk +LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -Wl,-Bdynamic DEPENDPATH += plugins INCLUDEPATH += . plugins