From 90d97c996a15f9ebc90fbd260f47f95ffbe68006 Mon Sep 17 00:00:00 2001 From: James Dong Date: Mon, 21 Mar 2011 21:57:00 -0700 Subject: Fix AMRWB test util and remove useless files Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e --- .../codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c | 2 +- .../codecs/amrwbenc/SampleCode/Android.mk | 24 +++++----- .../codecs/amrwbenc/SampleCode/eclair/Makefile | 56 ---------------------- .../codecs/amrwbenc/SampleCode/ms.mk | 24 ---------- .../codecs/amrwbenc/build/eclair/ARMV5E/Makefile | 53 -------------------- .../codecs/amrwbenc/build/eclair/ARMV7/Makefile | 53 -------------------- .../codecs/amrwbenc/build/eclair/makefile | 39 --------------- .../codecs/amrwbenc/build/eclair/ms.mk | 43 ----------------- 8 files changed, 13 insertions(+), 281 deletions(-) delete mode 100644 media/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile delete mode 100644 media/libstagefright/codecs/amrwbenc/SampleCode/ms.mk delete mode 100644 media/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile delete mode 100644 media/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile delete mode 100644 media/libstagefright/codecs/amrwbenc/build/eclair/makefile delete mode 100644 media/libstagefright/codecs/amrwbenc/build/eclair/ms.mk (limited to 'media/libstagefright/codecs') diff --git a/media/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c b/media/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c index 792d3cc..5e71a5b 100644 --- a/media/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c +++ b/media/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c @@ -129,7 +129,7 @@ int encode( useData.memData = (VO_PTR)(&moper); #ifdef LINUX - handle = dlopen("/data/local/tmp/voAMRWBEnc.so", RTLD_NOW); + handle = dlopen("libstagefright.so", RTLD_NOW); if(handle == 0) { printf("open dll error......"); diff --git a/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk b/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk index 7edb166..85ddceb 100644 --- a/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk @@ -1,26 +1,26 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := AMRWB_E_SAMPLE.c - -LOCAL_SRC_FILES += \ - ../../../Common/cmnMemory.c +LOCAL_SRC_FILES := \ + AMRWB_E_SAMPLE.c \ + ../../common/cmnMemory.c -LOCAL_MODULE := TestvoAMRWBEnc +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := AMRWBEncTest LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := +LOCAL_CFLAGS := $(VO_CFLAGS) -LOCAL_SHARED_LIBRARIES := libvoAMRWBEnc +LOCAL_SHARED_LIBRARIES := \ + libstagefright \ + libdl LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/ \ - $(LOCAL_PATH)/../../../Common \ - $(LOCAL_PATH)/../../../Include \ + $(LOCAL_PATH)/ \ + $(LOCAL_PATH)/../../common \ + $(LOCAL_PATH)/../../common/include -LOCAL_CFLAGS := $(VO_CFLAGS) - include $(BUILD_EXECUTABLE) diff --git a/media/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile b/media/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile deleted file mode 100644 index 55b876a..0000000 --- a/media/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ - -# target6 -# available: pc, v4(armv4), v5(armv5), v5x(armv5 xscale), v6(armv6), v7(cortex-a8 neon) -VOTT:= v6 - - -# module type -# please specify the type of your module: lib or exe -VOMT:= exe - - -# module macros -# please append the additional macro definitions here for your module if necessary. -# e.g. -DVISUALON, macro VISUALON defined for your module -VOMM:= #ARMV5E - - - -# please specify the name of your module -VOTARGET:= voAMRWBEnc_Test - - -# please modify here to be sure to see the g1.mk -include ../../../../Tools/eclair.mk - -# dependent libraries. -VODEPLIBS:=-ldl - - -# module source -# please modify here to be sure to see the ms.mk which specifies all source info of your module -include ../ms.mk - - -# please specify where is the voRelease on your PC, relative path is suggested -VORELDIR:=../ - - -# please modify here to be sure to see the doit.mk -include ../../../../Tools/doit.mk - diff --git a/media/libstagefright/codecs/amrwbenc/SampleCode/ms.mk b/media/libstagefright/codecs/amrwbenc/SampleCode/ms.mk deleted file mode 100644 index 74e8913..0000000 --- a/media/libstagefright/codecs/amrwbenc/SampleCode/ms.mk +++ /dev/null @@ -1,24 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ -# please list all objects needed by your target here -OBJS:=AMRWB_E_SAMPLE.o cmnMemory.o - -# please list all directories that all source files relative with your module(.h .c .cpp) locate -VOSRCDIR:=../ \ - ../../../../Common \ - ../../../../Include - - diff --git a/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile b/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile deleted file mode 100644 index 58fda29..0000000 --- a/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ - -# target type -# available: pc, v4(armv4), v5(armv5), v5x(armv5 xscale), v6(armv6), v7(cortex-a8 neon) -VOTT:= v5 - - -# module type -# please specify the type of your module: lib or exe -VOMT:= lib - - -# module macros -# please append the additional macro definitions here for your module if necessary. -ifeq ($(VOTT), v5) -VOMM:=-DARM -DASM_OPT -endif - -# please specify the name of your module -VOTARGET:= libvoAMRWBEncv5 - - -# please modify here to be sure to see the g1.mk -include ../../../../../Tools/eclair.mk - -# dependent libraries. -VODEPLIBS:=-ldl -lstdc++ -lcutils - -# module source -# please modify here to be sure to see the ms.mk which specifies all source info of your module -include ../ms.mk - - -# please specify where is the voRelease on your PC, relative path is suggested -VORELDIR:=../../../../../../Release - -# please modify here to be sure to see the doit.mk -include ../../../../../Tools/doit.mk - diff --git a/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile b/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile deleted file mode 100644 index 5686411..0000000 --- a/media/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ - -# target type -# available: pc, v4(armv4), v5(armv5), v5x(armv5 xscale), v6(armv6), v7(cortex-a8 neon) -VOTT:= v7 - - -# module type -# please specify the type of your module: lib or exe -VOMT:= lib - - -# module macros -# please append the additional macro definitions here for your module if necessary. -ifeq ($(VOTT), v7) -VOMM:=-DARM -DARMV7 -DASM_OPT -endif - -# please specify the name of your module -VOTARGET:= libvoAMRWBEncv7 - - -# please modify here to be sure to see the g1.mk -include ../../../../../Tools/eclair.mk - -# dependent libraries. -VODEPLIBS:=-ldl -lstdc++ -lcutils - -# module source -# please modify here to be sure to see the ms.mk which specifies all source info of your module -include ../ms.mk - - -# please specify where is the voRelease on your PC, relative path is suggested -VORELDIR:=../../../../../../Release - -# please modify here to be sure to see the doit.mk -include ../../../../../Tools/doit.mk - diff --git a/media/libstagefright/codecs/amrwbenc/build/eclair/makefile b/media/libstagefright/codecs/amrwbenc/build/eclair/makefile deleted file mode 100644 index 3473a1a..0000000 --- a/media/libstagefright/codecs/amrwbenc/build/eclair/makefile +++ /dev/null @@ -1,39 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ -# Just acting as Father Makefile of Modules -# please keep the name 'makefile' unchanged - -# Module Subdirs -VOMSD:=$(dir $(shell find . -name 'Makefile')) - -all: - for dir in $(VOMSD); \ - do \ - $(MAKE) -C $$dir; \ - done - -.PHONY:clean devel -clean: - for dir in $(VOMSD); \ - do \ - $(MAKE) -C $$dir clean; \ - done - -devel: - for dir in $(VOMSD); \ - do \ - $(MAKE) -C $$dir devel; \ - done diff --git a/media/libstagefright/codecs/amrwbenc/build/eclair/ms.mk b/media/libstagefright/codecs/amrwbenc/build/eclair/ms.mk deleted file mode 100644 index bd6620c..0000000 --- a/media/libstagefright/codecs/amrwbenc/build/eclair/ms.mk +++ /dev/null @@ -1,43 +0,0 @@ -#/* -# ** Copyright 2003-2010, VisualOn, Inc. -# ** -# ** Licensed under the Apache License, Version 2.0 (the "License"); -# ** you may not use this file except in compliance with the License. -# ** You may obtain a copy of the License at -# ** -# ** http://www.apache.org/licenses/LICENSE-2.0 -# ** -# ** Unless required by applicable law or agreed to in writing, software -# ** distributed under the License is distributed on an "AS IS" BASIS, -# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# ** See the License for the specific language governing permissions and -# ** limitations under the License. -# */ -# please list all directories that all source files relative with your module(.h .c .cpp) locate -VOSRCDIR:=../../../inc \ - ../../../src \ - ../../../../../Include - -# please list all objects needed by your target here -OBJS:= autocorr.o az_isp.o bits.o c2t64fx.o c4t64fx.o convolve.o cor_h_x.o decim54.o \ - deemph.o dtx.o g_pitch.o gpclip.o homing.o hp400.o hp50.o hp6k.o hp_wsp.o \ - int_lpc.o isp_az.o isp_isf.o lag_wind.o levinson.o log2.o lp_dec2.o math_op.o mem_align.o \ - oper_32b.o p_med_ol.o pit_shrp.o pitch_f4.o pred_lt4.o preemph.o q_gain2.o q_pulse.o \ - qisf_ns.o qpisf_2s.o random.o residu.o scale.o stream.o syn_filt.o updt_tar.o util.o \ - voAMRWBEnc.o voicefac.o wb_vad.o weight_a.o - - -ifeq ($(VOTT), v5) -OBJS += cor_h_vec_opt.o Deemph_32_opt.o Dot_p_opt.o Filt_6k_7k_opt.o residu_asm_opt.o \ - scale_sig_opt.o Syn_filt_32_opt.o syn_filt_opt.o pred_lt4_1_opt.o convolve_opt.o \ - Norm_Corr_opt.o -VOSRCDIR+= ../../../src/asm/ARMV5E -endif - -ifeq ($(VOTT), v7) -OBJS+= cor_h_vec_neon.o Deemph_32_neon.o Dot_p_neon.o Filt_6k_7k_neon.o residu_asm_neon.o \ - scale_sig_neon.o Syn_filt_32_neon.o syn_filt_neon.o pred_lt4_1_neon.o convolve_neon.o \ - Norm_Corr_neon.o -VOSRCDIR+= ../../../src/asm/ARMV7 -endif - -- cgit v1.1