diff --git a/samplebrain/Makefile.in b/samplebrain/Makefile.in index a9fb82b..ae8125d 100644 --- a/samplebrain/Makefile.in +++ b/samplebrain/Makefile.in @@ -13,8 +13,8 @@ SRCS := src/fft.cpp \ TARGET_SRCS := src/main.cpp -# for the minute, go out and up to link to the vision lib -CCFLAGS = @CFLAGS@ -std=c++11 -ffast-math -Wno-unused -Isrc +# @CFLAGS@ +CCFLAGS = -Ofast -march=native -mtune=native -std=c++11 -ffast-math -Wno-unused -Isrc LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/samplebrain/configure b/samplebrain/configure index 916006f..44a323a 100755 --- a/samplebrain/configure +++ b/samplebrain/configure @@ -2036,6 +2036,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +: ${CXXFLAGS="-O3"} ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/samplebrain/configure.ac b/samplebrain/configure.ac index f5ccea2..93dfa1a 100644 --- a/samplebrain/configure.ac +++ b/samplebrain/configure.ac @@ -1,4 +1,5 @@ AC_INIT(samplebrain, version-0.1) +: ${CXXFLAGS="-O3"} AC_PROG_CC AC_CHECK_LIB(m, cos) diff --git a/samplebrain/dist.sh b/samplebrain/dist.sh index 96f6a72..9250258 100755 --- a/samplebrain/dist.sh +++ b/samplebrain/dist.sh @@ -4,4 +4,4 @@ make distclean autoheader # build configure autoconf configure.ac > configure -./configure CXX=g++-4.7 CCFLAGS=-O3 +./configure 'CXX=g++-4.7' 'CXXFLAGS=-O3' diff --git a/samplebrain/src/block.cpp b/samplebrain/src/block.cpp index 73ac179..b2855ac 100644 --- a/samplebrain/src/block.cpp +++ b/samplebrain/src/block.cpp @@ -66,6 +66,8 @@ void block::init_fft(u32 block_size) } } +#define FFT_BIAS 200 + double block::compare(const block &other, float ratio) const { double mfcc_acc=0; double fft_acc=0; @@ -74,7 +76,7 @@ double block::compare(const block &other, float ratio) const { for (u32 i=0; i::iterator i=m_blocks.begin(); i!=m_blocks.end(); ++i) { cerr<<'\r'; cerr<<"searching: "<=m_target.get_num_blocks()) { m_render_time=0; m_render_blocks.clear();