Mercurial > hg > nnls-chroma
changeset 147:a85e745c0721
attempt to resolve problem of mangitude threshold for small frame sizes
| author | matthiasm |
|---|---|
| date | Thu, 05 Sep 2013 03:10:30 +0100 |
| parents | 0d70058c2bce |
| children | 5a7f78c34133 |
| files | Makefile.osx NNLSBase.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.osx Tue Jun 19 16:28:16 2012 +0100 +++ b/Makefile.osx Thu Sep 05 03:10:30 2013 +0100 @@ -12,9 +12,9 @@ ## Uncomment these for an OS/X native build using command-line tools: -ARCHFLAGS = -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -arch i386 +ARCHFLAGS = -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.5 -arch i386 -arch x86_64 CFLAGS = $(ARCHFLAGS) -Wall -fPIC -g -O3 -CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT) +CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT) -I. PLUGIN_EXT = .dylib PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) LDFLAGS = $(ARCHFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list -framework Accelerate
--- a/NNLSBase.cpp Tue Jun 19 16:28:16 2012 +0100 +++ b/NNLSBase.cpp Thu Sep 05 03:10:30 2013 +0100 @@ -465,7 +465,7 @@ } } - if (maxmag < 2) { + if (maxmag < m_blockSize * 2.0 / 16384.0) { // this is not quite right, I think // cerr << "timestamp " << timestamp << ": very low magnitude, setting magnitude to all zeros" << endl; for (int iBin = 0; iBin < static_cast<int>(m_blockSize/2); iBin++) { magnitude[iBin] = 0;