Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix AMRNB light compilation and use updated msamr codec

Browse source
This commit is contained in:
Yann Diorcet 2012-01-27 13:57:06 +01:00
parent 285490babc
commit 1e9bef5a9d
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
submodules/externals/build/opencore-amr/Android.mk vendored
View file

@ -12,30 +12,37 @@ _ADD_COMMON=0
ifneq ($(BUILD_AMRWB),0) ifneq ($(BUILD_AMRWB),0)
_ADD_COMMON=1 _ADD_COMMON=1
endif endif
ifeq ($(BUILD_AMRNB),full) ifneq ($(BUILD_AMRNB),0)
_ADD_COMMON=1 _ADD_COMMON=1
endif endif
ifneq ($(BUILD_AMRNB),0)
LOCAL_SRC_FILES += \
amrnb/wrapper.cpp
endif
ifneq ($(BUILD_AMRWB),0)
LOCAL_SRC_FILES += \
amrwb/wrapper.cpp
endif
ifeq ($(BUILD_AMRNB),light) ifeq ($(BUILD_AMRNB),light)
LOCAL_SRC_FILES += \
amrnb/wrapper.cpp
LOCAL_SRC_FILES += \
../build/opencore-amr/stubs.cpp
#for including config.h:
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/include \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/include \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include \
$(LOCAL_PATH)/opencore/codecs_v2/audio/gsm_amr/common/dec/include \
$(LOCAL_PATH)/amrnb
#in this mode we try to dynamically link against the opencore-amr provided by android #in this mode we try to dynamically link against the opencore-amr provided by android
LOCAL_CFLAGS += -include ../build/opencore-amr/stubs.h LOCAL_CFLAGS += -include ../build/opencore-amr/stubs.h
LOCAL_SRC_FILES += ../build/opencore-amr/stubs.cpp
endif endif
ifeq ($(BUILD_AMRNB),full) ifeq ($(BUILD_AMRNB),full)
#in the other mode (full) we build our own opencore-amr. #in the other mode (full) we build our own opencore-amr.
#common files #common files
LOCAL_SRC_FILES += \
amrnb/wrapper.cpp
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/add.cpp \ opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/add.cpp \
@ -206,6 +213,9 @@ LOCAL_C_INCLUDES += \
endif endif
ifneq ($(BUILD_AMRWB),0) ifneq ($(BUILD_AMRWB),0)
LOCAL_SRC_FILES += \
amrwb/wrapper.cpp
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/agc2_amr_wb.cpp \ opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/agc2_amr_wb.cpp \
opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/band_pass_6k_7k.cpp \ opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/band_pass_6k_7k.cpp \

2
submodules/msamr

@ -1 +1 @@
Subproject commit 2d6201d948ae30d1eff9c3db8f3c7f7475e615c3 Subproject commit 61ab5cb11a63a5f8e10cced9d481979718199954