generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(1) Corrected the makefile for testing iLBC in Android, and changed the location of the test makefile to make it consistent with audio_processing.

Browse Source 
(2) Added a makefile for testing fiexed point iSAC in Android.
Review URL: http://webrtc-codereview.appspot.com/266005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@927 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org 2011-11-10 18:00:22 +00:00
parent 7a4eb2837a
commit 13318ef422
3 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
View File

@ -60,3 +60,30 @@ ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# isac test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= ../test/kenny.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../../../..
LOCAL_SHARED_LIBRARIES := \
libutils \
libwebrtc
LOCAL_MODULE:= webrtc_isac_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include $(BUILD_NATIVE_TEST)
endif

53
src/modules/audio_coding/codecs/ilbc/Android.mk
View File

@ -104,3 +104,56 @@ ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# iLBC test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= test/iLBC_test.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \
$(LOCAL_PATH)/../../../..
LOCAL_SHARED_LIBRARIES := \
libutils \
libwebrtc
LOCAL_MODULE:= webrtc_ilbc_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include $(BUILD_NATIVE_TEST)
endif
# iLBC_testLib test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= test/iLBC_testLib.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \
$(LOCAL_PATH)/../../../..
LOCAL_SHARED_LIBRARIES := \
libutils \
libwebrtc
LOCAL_MODULE:= webrtc_ilbc_testLib
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include $(BUILD_NATIVE_TEST)
endif

66
src/modules/audio_coding/codecs/ilbc/test/Android.mk
View File

@ -1,66 +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)
# iLBC test app
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \
iLBC_test.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../../..
LOCAL_SHARED_LIBRARIES := \
libutils \
libwebrtc
LOCAL_MODULE:= webrtc_iLBC_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include $(BUILD_NATIVE_TEST)
endif
# iLBC_testLib test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \
iLBC_testLib.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../..
LOCAL_SHARED_LIBRARIES := \
libutils \
libwebrtc
LOCAL_MODULE:= webrtc_iLBC_testLib
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include $(BUILD_NATIVE_TEST)
endif