diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-10-15 15:00:55 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-10-15 15:00:55 +0530 |
| commit | a372bbbb3d6ac483390be3718cd491e855fca6a6 (patch) | |
| tree | b4259208e5d0ff680dada067086f632001ad8c90 | |
| parent | 00ab77e9081c72c0413235a025f95f66d5e47bf6 (diff) | |
| download | linaro-android-userspace-test-a372bbbb3d6ac483390be3718cd491e855fca6a6.tar.gz | |
speech-codec: amrnb: rename amrnb enc and dec tests
There are these new set of amr enc and dec tests landed in AOSP
in frameworks/av, I'm not sure if they are the one which we tried
to upstream. Meanwhile I'm just renaming our tests untill someone
actually take a look and compare both set of tests
Change-Id: Icb6b351446d23c53e6f39a3cbc0c0669819ca04d
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rwxr-xr-x | linaro-android-userspace-tests.sh | 12 | ||||
| -rw-r--r-- | product.mk | 4 | ||||
| -rw-r--r-- | speech-codec/amrnb/Android.mk | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/linaro-android-userspace-tests.sh b/linaro-android-userspace-tests.sh index fad8fe7..aa9b29d 100755 --- a/linaro-android-userspace-tests.sh +++ b/linaro-android-userspace-tests.sh @@ -13,7 +13,7 @@ # Individual and batch test definitions ALL_AUDIO_CODECS="audio_codec_aac audio_codec_flac audio_codec_mp3 \ audio_codec_tremolo" -ALL_SPEECH_CODECS="speech_codec_amrnb_dec speech_codec_amrnb_enc \ +ALL_SPEECH_CODECS="speech_codec_amrnb_dec_linaro speech_codec_amrnb_enc_linaro \ speech_codec_amrwb_dec speech_codec_amrwb_enc" ALL_VIDEO_CODECS="video_codec_h264_dec video_codec_h264_enc \ video_codec_h263_dec video_codec_h263_enc" @@ -47,7 +47,7 @@ usage() { printf " %-10s\t%s\n" "-v" "Turn on verbose output" echo echo "Example:" - echo "\t$0 -t \"audio_codec_aac speech_codec_amrnb_dec\"" + echo "\t$0 -t \"audio_codec_aac speech_codec_amrnb_dec_linaro\"" } run_audio_codec_aac() @@ -299,23 +299,23 @@ run_speech_codec() run_speech_codec_amrnb_dec() { - local TAG="speech_codec_amrnb_dec" + local TAG="speech_codec_amrnb_dec_linaro" local NAME="AMR NB decoder test" local DATA_DIR="/data/linaro-android-userspace-test/speech-codec/amrnb" local MD5SUM_FILE="${DATA_DIR}/MD5SUM.dec" - run_speech_codec 0 "${TAG}" "${NAME}" "${DATA_DIR}" "${MD5SUM_FILE}" "libstagefright_amrnbdec_test" + run_speech_codec 0 "${TAG}" "${NAME}" "${DATA_DIR}" "${MD5SUM_FILE}" "libstagefright_amrnbdec_test_linaro" return $? } run_speech_codec_amrnb_enc() { - local TAG="speech_codec_amrnb_enc" + local TAG="speech_codec_amrnb_enc_linaro" local NAME="AMR NB encoder test" local DATA_DIR="/data/linaro-android-userspace-test/speech-codec/amrnb" local MD5SUM_FILE="${DATA_DIR}/MD5SUM.enc" - run_speech_codec 1 "${TAG}" "${NAME}" "${DATA_DIR}" "${MD5SUM_FILE}" "libstagefright_amrnbenc_test" + run_speech_codec 1 "${TAG}" "${NAME}" "${DATA_DIR}" "${MD5SUM_FILE}" "libstagefright_amrnbenc_test_linaro" return $? } @@ -15,8 +15,8 @@ PRODUCT_PACKAGES += \ libFLAC_test \ libstagefright_mp3dec_test \ libvorbisidec_test \ - libstagefright_amrnbdec_test \ - libstagefright_amrnbenc_test \ + libstagefright_amrnbdec_test_linaro \ + libstagefright_amrnbenc_test_linaro \ libstagefright_amrwbdec_test \ libstagefright_amrwbenc_test \ libstagefright_h264dec_test \ diff --git a/speech-codec/amrnb/Android.mk b/speech-codec/amrnb/Android.mk index f5a32ed..82c038c 100644 --- a/speech-codec/amrnb/Android.mk +++ b/speech-codec/amrnb/Android.mk @@ -75,7 +75,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DOSCL_UNUSED_ARG= -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF= -LOCAL_MODULE := libstagefright_amrnb_common +LOCAL_MODULE := libstagefright_amrnb_common_linaro include $(BUILD_STATIC_LIBRARY) @@ -92,10 +92,10 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-utils) LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_amrnbdec libstagefright_amrnb_common \ + libc libstagefright_amrnbdec libstagefright_amrnb_common_linaro \ libsndfile libaudioprimitives -LOCAL_MODULE := libstagefright_amrnbdec_test +LOCAL_MODULE := libstagefright_amrnbdec_test_linaro LOCAL_MODULE_TAGS := optional tests LOCAL_MULTILIB := 32 @@ -115,9 +115,9 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/codecs/amrnb/common/include LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_amrnbenc libstagefright_amrnb_common + libc libstagefright_amrnbenc libstagefright_amrnb_common_linaro -LOCAL_MODULE := libstagefright_amrnbenc_test +LOCAL_MODULE := libstagefright_amrnbenc_test_linaro LOCAL_MODULE_TAGS := optional tests LOCAL_MULTILIB := 32 |