Skip to content

Commit 76c563a

Browse files
committed
Change FFT library to commercial friendly implementation
1. Fix memory leaks
1 parent 2fdb6ad commit 76c563a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3404
-2697
lines changed

Audio_Engine/eclipse_libjamesdsp_free_bp/jni/Android.mk

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
LOCAL_PATH := $(call my-dir)
22
include $(CLEAR_VARS)
3-
LOCAL_MODULE := fftw3
4-
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
5-
LOCAL_SRC_FILES := fftw/DoubleARM/libfftw3.a
6-
else ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
7-
LOCAL_SRC_FILES := fftw/DoubleARM64/libfftw3.a
8-
else ifeq ($(TARGET_ARCH_ABI), x86)
9-
LOCAL_SRC_FILES := fftw/Doublex86/libfftw3.a
10-
endif
11-
include $(PREBUILT_STATIC_LIBRARY)
12-
include $(CLEAR_VARS)
13-
LOCAL_MODULE := fftw3thread
14-
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
15-
LOCAL_SRC_FILES := fftw/DoubleARM/libfftw3_threads.a
16-
else ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
17-
LOCAL_SRC_FILES := fftw/DoubleARM64/libfftw3_threads.a
18-
else ifeq ($(TARGET_ARCH_ABI), x86)
19-
LOCAL_SRC_FILES := fftw/Doublex86/libfftw3_threads.a
20-
endif
21-
include $(PREBUILT_STATIC_LIBRARY)
22-
include $(CLEAR_VARS)
233
LOCAL_MODULE := libjamesdsp
244
LOCAL_PRELINK_MODULE := false
255
LOCAL_SRC_FILES := \
6+
kissfft/kiss_fft.c \
7+
kissfft/kiss_fftr.c \
268
jamesdsp.cpp \
279
Effect.cpp \
2810
EffectDSPMain.cpp \
@@ -40,8 +22,6 @@ LOCAL_SRC_FILES := \
4022
# valve/wavechild670/wdfcircuits.c \
4123
# valve/wavechild670/wavechild670.c \
4224
# terminator
43-
44-
LOCAL_STATIC_LIBRARIES := fftw3thread fftw3
4525
#LOCAL_LDLIBS := -llog
4626
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
4727
LOCAL_CPPFLAGS += -Wall -Wextra -ffunction-sections -fdata-sections -Ofast -march=armv7-a -mfpu=neon -ftree-vectorize -DNDEBUG# -DDEBUG

0 commit comments

Comments
 (0)