diff options
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/isac')
8 files changed, 152 insertions, 275 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp new file mode 100644 index 0000000000..374d1b13cf --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp @@ -0,0 +1,6 @@ +subdirs = ["*"] + +cc_library_headers { + name: "libwebrtc_isacfix_headers", + export_include_dirs: ["include"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp new file mode 100644 index 0000000000..78a56619b9 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp @@ -0,0 +1,66 @@ +// 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_isacfix", + defaults: ["webrtc_flags"], + + arch: { + arm: { + // Using .S (instead of .s) extention is to include a C header file in assembly. + srcs: [ + "lattice_armv7.S", + "pitch_filter_armv6.S", + ], + exclude_srcs: [ + "lattice_c.c", + "pitch_filter_c.c", + ], + }, + mips: { + // TODO: Use pitch_estimator_mips.c for mips, pitch_estimator_c.c + }, + }, + + srcs: [ + "arith_routines.c", + "arith_routines_hist.c", + "arith_routines_logist.c", + "bandwidth_estimator.c", + "decode.c", + "decode_bwe.c", + "decode_plc.c", + "encode.c", + "entropy_coding.c", + "fft.c", + "filterbank_tables.c", + "filterbanks.c", + "filters.c", + "initialize.c", + "isacfix.c", + "lattice.c", + "lpc_masking_model.c", + "lpc_tables.c", + "pitch_estimator.c", + "pitch_estimator_c.c", + "pitch_filter.c", + "pitch_gain_tables.c", + "pitch_lag_tables.c", + "spectrum_ar_model_tables.c", + "transform_tables.c", + "transform.c", + + // These are replaced by assembly versions in arm builds + "lattice_c.c", + "pitch_filter_c.c", + ], + + header_libs: ["libwebrtc_isacfix_headers"], + export_header_lib_headers: ["libwebrtc_isacfix_headers"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk deleted file mode 100644 index 7fdc534334..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ /dev/null @@ -1,133 +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. - -############################# -# Build the non-neon library. - -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_isacfix -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - arith_routines.c \ - arith_routines_hist.c \ - arith_routines_logist.c \ - bandwidth_estimator.c \ - decode.c \ - decode_bwe.c \ - decode_plc.c \ - encode.c \ - entropy_coding.c \ - fft.c \ - filterbank_tables.c \ - filterbanks.c \ - filters.c \ - initialize.c \ - isacfix.c \ - lattice.c \ - lpc_masking_model.c \ - lpc_tables.c \ - pitch_estimator.c \ - pitch_estimator_c.c \ - pitch_filter.c \ - pitch_gain_tables.c \ - pitch_lag_tables.c \ - spectrum_ar_model_tables.c \ - transform_tables.c \ - transform.c - -# TODO: Use pitch_estimator_mips.c for mips, pitch_estimator_c.c - -# Using .S (instead of .s) extention is to include a C header file in assembly. -my_as_src := \ - lattice_armv7.S \ - pitch_filter_armv6.S -my_c_src := \ - lattice_c.c \ - pitch_filter_c.c -LOCAL_SRC_FILES_arm += $(my_as_src) -LOCAL_SRC_FILES_x86 += $(my_c_src) -LOCAL_SRC_FILES_mips += $(my_c_src) -LOCAL_SRC_FILES_arm64 += $(my_c_src) -LOCAL_SRC_FILES_x86_64 += $(my_c_src) -LOCAL_SRC_FILES_mips64 += $(my_c_src) - -# 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)/../interface \ - $(LOCAL_PATH)/../../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/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) - -######################### -# Build the neon library. -ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_isacfix_neon -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - filters_neon.c \ - lattice_neon.S \ - lpc_masking_model_neon.S - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) \ - -mfpu=neon \ - -mfloat-abi=softfp \ - -flax-vector-conversions - -LOCAL_MODULE_TARGET_ARCH := arm -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/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) - -endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp new file mode 100644 index 0000000000..577744cbe4 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp @@ -0,0 +1,28 @@ +// 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_test { + name: "webrtc_isac_test", + defaults: ["webrtc_flags"], + + srcs: ["kenny.cc"], + + static_libs: [ + "libwebrtc_isacfix", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + ], + + shared_libs: ["libutils"], + + arch: { + arm: { + instruction_set: "thumb", + }, + }, +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk deleted file mode 100644 index d6a03a02ff..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk +++ /dev/null @@ -1,67 +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. - -########################### -# isac test app - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= kenny.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)/../../../../../../.. - -MY_LIB_SUFFIX := -ifdef WEBRTC_STL -MY_LIB_SUFFIX := _$(WEBRTC_STL) -endif - -LOCAL_STATIC_LIBRARIES := \ - libwebrtc_isacfix$(MY_LIB_SUFFIX) \ - libwebrtc_spl$(MY_LIB_SUFFIX) \ - libwebrtc_system_wrappers$(MY_LIB_SUFFIX) - -ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) -# We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX) -# has dependency on it. -LOCAL_STATIC_LIBRARIES_arm += \ - libwebrtc_isacfix$(MY_LIB_SUFFIX) \ - libwebrtc_isacfix_neon$(MY_LIB_SUFFIX) -endif - -LOCAL_SHARED_LIBRARIES := \ - libutils - -LOCAL_MODULE := webrtc_isac_test - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -LOCAL_SHARED_LIBRARIES := -endif - -include $(BUILD_NATIVE_TEST) diff --git a/webrtc/modules/audio_coding/codecs/isac/main/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp new file mode 100644 index 0000000000..19801687a5 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp @@ -0,0 +1,6 @@ +subdirs = ["source"] + +cc_library_headers { + name: "libwebrtc_isac_interface", + export_include_dirs: ["include"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp new file mode 100644 index 0000000000..dab60c4034 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp @@ -0,0 +1,46 @@ +// 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_isac", + defaults: ["webrtc_flags"], + + srcs: [ + "arith_routines.c", + "arith_routines_hist.c", + "arith_routines_logist.c", + "bandwidth_estimator.c", + "crc.c", + "decode.c", + "decode_bwe.c", + "encode.c", + "encode_lpc_swb.c", + "entropy_coding.c", + "fft.c", + "filter_functions.c", + "filterbank_tables.c", + "filterbanks.c", + "intialize.c", + "isac.c", + "pitch_lag_tables.c", + "lattice.c", + "lpc_gain_swb_tables.c", + "lpc_analysis.c", + "lpc_shape_swb12_tables.c", + "lpc_shape_swb16_tables.c", + "lpc_tables.c", + "pitch_estimator.c", + "pitch_filter.c", + "pitch_gain_tables.c", + "spectrum_ar_model_tables.c", + "transform.c", + ], + + header_libs: ["libwebrtc_isac_interface"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk deleted file mode 100644 index f1d30742e2..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk +++ /dev/null @@ -1,75 +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_isac -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - arith_routines.c \ - arith_routines_hist.c \ - arith_routines_logist.c \ - bandwidth_estimator.c \ - crc.c \ - decode.c \ - decode_bwe.c \ - encode.c \ - encode_lpc_swb.c \ - entropy_coding.c \ - fft.c \ - filter_functions.c \ - filterbank_tables.c \ - filterbanks.c \ - intialize.c \ - isac.c \ - pitch_lag_tables.c \ - lattice.c \ - lpc_gain_swb_tables.c \ - lpc_analysis.c \ - lpc_shape_swb12_tables.c \ - lpc_shape_swb16_tables.c \ - lpc_tables.c \ - pitch_estimator.c \ - pitch_filter.c \ - pitch_gain_tables.c \ - spectrum_ar_model_tables.c \ - transform.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)/../../../../../../common_audio/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) |