diff options
Diffstat (limited to 'webrtc/common_audio')
| -rw-r--r-- | webrtc/common_audio/Android.bp | 47 | ||||
| -rw-r--r-- | webrtc/common_audio/Android.mk | 64 | ||||
| -rw-r--r-- | webrtc/common_audio/resampler/Android.bp | 35 | ||||
| -rw-r--r-- | webrtc/common_audio/resampler/Android.mk | 54 | ||||
| -rw-r--r-- | webrtc/common_audio/signal_processing/Android.bp | 80 | ||||
| -rw-r--r-- | webrtc/common_audio/signal_processing/Android.mk | 108 | ||||
| -rw-r--r-- | webrtc/common_audio/vad/Android.bp | 23 | ||||
| -rw-r--r-- | webrtc/common_audio/vad/Android.mk | 52 |
8 files changed, 185 insertions, 278 deletions
diff --git a/webrtc/common_audio/Android.bp b/webrtc/common_audio/Android.bp new file mode 100644 index 0000000000..1ecf430c0c --- /dev/null +++ b/webrtc/common_audio/Android.bp @@ -0,0 +1,47 @@ +// Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. + +subdirs = ["*"] + +cc_library_static { + name: "libwebrtc_common", + defaults: ["webrtc_flags"], + + srcs: [ + "audio_converter.cc", + "audio_util.cc", + "blocker.cc", + "channel_buffer.cc", + "fft4g.c", + "fir_filter.cc", + "lapped_transform.cc", + "real_fourier_ooura.cc", + "real_fourier.cc", + "ring_buffer.c", + "audio_ring_buffer.cc", + "sparse_fir_filter.cc", + "window_generator.cc", + ], + + arch: { + x86: { + srcs: ["fir_filter_sse.cc"], + }, + x86_64: { + srcs: ["fir_filter_sse.cc"], + }, + }, +} + +filegroup { + name: "webrtc_common_audio_wav", + srcs: [ + "wav_file.cc", + "wav_header.cc", + ], +} diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk deleted file mode 100644 index 31f4b3068c..0000000000 --- a/webrtc/common_audio/Android.mk +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_common -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - audio_converter.cc \ - audio_util.cc \ - blocker.cc \ - channel_buffer.cc \ - fft4g.c \ - fir_filter.cc \ - lapped_transform.cc \ - real_fourier_ooura.cc \ - real_fourier.cc \ - ring_buffer.c \ - audio_ring_buffer.cc \ - sparse_fir_filter.cc \ - window_generator.cc \ - -LOCAL_SRC_FILES_x86 += fir_filter_sse.cc -LOCAL_SRC_FILES_x86_64 += fir_filter_sse.cc - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../.. \ - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/resampler/Android.bp b/webrtc/common_audio/resampler/Android.bp new file mode 100644 index 0000000000..d4408dc8cb --- /dev/null +++ b/webrtc/common_audio/resampler/Android.bp @@ -0,0 +1,35 @@ +// Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. + +cc_library_static { + name: "libwebrtc_resampler", + defaults: ["webrtc_flags"], + + arch: { + x86: { + srcs: ["sinc_resampler_sse.cc"], + }, + x86_64: { + srcs: ["sinc_resampler_sse.cc"], + }, + }, + + srcs: [ + "push_sinc_resampler.cc", + "resampler.cc", + "sinc_resampler.cc", + ], + + local_include_dirs: ["include"], + static_libs: ["libwebrtc_spl"], +} + +filegroup { + name: "webrtc_common_audio_resampler_push_resampler", + srcs: ["push_resampler.cc"], +} diff --git a/webrtc/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk deleted file mode 100644 index 5ddef2d2a5..0000000000 --- a/webrtc/common_audio/resampler/Android.mk +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_resampler -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - push_sinc_resampler.cc \ - resampler.cc \ - sinc_resampler.cc \ - -LOCAL_SRC_FILES_x86 += sinc_resampler_sse.cc -LOCAL_SRC_FILES_x86_64 += sinc_resampler_sse.cc - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../signal_processing/include - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/signal_processing/Android.bp b/webrtc/common_audio/signal_processing/Android.bp new file mode 100644 index 0000000000..77a5c5b9ab --- /dev/null +++ b/webrtc/common_audio/signal_processing/Android.bp @@ -0,0 +1,80 @@ +// Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. + +cc_library_static { + name: "libwebrtc_spl", + defaults: ["webrtc_flags"], + + arch: { + arm: { + srcs: [ + "complex_bit_reverse_arm.S", + "spl_sqrt_floor_arm.S", + + // Some new .s files have compilation error with AOSP configuration, + // so they are not used. The next merge of upstream .S file might work. + // "cross_correlation_neon.s", + // "downsample_fast_neon.s", + // "min_max_operations_neon.s", + // "vector_scaling_operations_neon.s", + + // "filter_ar_fast_q12_armv7.S", + ], + exclude_srcs: [ + "complex_bit_reverse.c", + "spl_sqrt_floor.c", + + // "cross_correlation.c", + // "downsample_fast.c", + + //"filter_ar_fast_q12.c", + ], + }, + }, + + srcs: [ + "auto_corr_to_refl_coef.c", + "auto_correlation.c", + "complex_fft.c", + "copy_set_operations.c", + "division_operations.c", + "dot_product_with_scale.c", + "energy.c", + "filter_ar.c", + "filter_ma_fast_q12.c", + "get_hanning_window.c", + "get_scaling_square.c", + "ilbc_specific_functions.c", + "levinson_durbin.c", + "lpc_to_refl_coef.c", + "min_max_operations.c", + "randomization_functions.c", + "real_fft.c", + "refl_coef_to_lpc.c", + "resample.c", + "resample_48khz.c", + "resample_by_2.c", + "resample_by_2_internal.c", + "resample_fractional.c", + "spl_init.c", + "spl_sqrt.c", + "splitting_filter.c", + "sqrt_of_one_minus_x_squared.c", + "vector_scaling_operations.c", + + // These are replaced by assembly for arm builds + "complex_bit_reverse.c", + "spl_sqrt_floor.c", + + "filter_ar_fast_q12.c", + "cross_correlation.c", + "downsample_fast.c", + ], + + export_include_dirs: ["include"], +} diff --git a/webrtc/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk deleted file mode 100644 index 97319c6672..0000000000 --- a/webrtc/common_audio/signal_processing/Android.mk +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_spl -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - auto_corr_to_refl_coef.c \ - auto_correlation.c \ - complex_fft.c \ - copy_set_operations.c \ - division_operations.c \ - dot_product_with_scale.c \ - energy.c \ - filter_ar.c \ - filter_ma_fast_q12.c \ - get_hanning_window.c \ - get_scaling_square.c \ - ilbc_specific_functions.c \ - levinson_durbin.c \ - lpc_to_refl_coef.c \ - min_max_operations.c \ - randomization_functions.c \ - real_fft.c \ - refl_coef_to_lpc.c \ - resample.c \ - resample_48khz.c \ - resample_by_2.c \ - resample_by_2_internal.c \ - resample_fractional.c \ - spl_init.c \ - spl_sqrt.c \ - splitting_filter.c \ - sqrt_of_one_minus_x_squared.c \ - vector_scaling_operations.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. - -# Some new .s files have compilation error with AOSP configuration, -# so they are not used. The next merge of upstream .S file might work. -#ifeq ($(ARCH_ARM_HAVE_NEON),true) -#LOCAL_SRC_FILES += \ -# cross_correlation_neon.s \ -# downsample_fast_neon.s \ -# min_max_operations_neon.s \ -# vector_scaling_operations_neon.s -#LOCAL_CFLAGS += \ -# $(MY_ARM_CFLAGS_NEON) -#else -LOCAL_SRC_FILES += \ - cross_correlation.c \ - downsample_fast.c -#endif - -#ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) -#LOCAL_SRC_FILES += \ -# filter_ar_fast_q12_armv7.S -#else -LOCAL_SRC_FILES += \ - filter_ar_fast_q12.c -#endif - -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ - complex_bit_reverse_arm.S \ - spl_sqrt_floor_arm.S -else -LOCAL_SRC_FILES += \ - complex_bit_reverse.c \ - spl_sqrt_floor.c -endif - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/vad/Android.bp b/webrtc/common_audio/vad/Android.bp new file mode 100644 index 0000000000..655de82aea --- /dev/null +++ b/webrtc/common_audio/vad/Android.bp @@ -0,0 +1,23 @@ +// Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. + +cc_library_static { + name: "libwebrtc_vad", + defaults: ["webrtc_flags"], + + srcs: [ + "webrtc_vad.c", + "vad_core.c", + "vad_filterbank.c", + "vad_gmm.c", + "vad_sp.c", + ], + + export_include_dirs: ["include"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk deleted file mode 100644 index 2b328deeb7..0000000000 --- a/webrtc/common_audio/vad/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_vad -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - webrtc_vad.c \ - vad_core.c \ - vad_filterbank.c \ - vad_gmm.c \ - vad_sp.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../signal_processing/include - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - -include $(BUILD_STATIC_LIBRARY) |