| author | Tellen Yu <tellen.yu@amlogic.com> | 2018-01-12 01:16:54 (GMT) |
|---|---|---|
| committer | Tellen Yu <tellen.yu@amlogic.com> | 2018-01-12 02:48:47 (GMT) |
| commit | 282c6c12c14bd51cd4dc1468a5d81b4369ed076b (patch) | |
| tree | 376746ceb67c65d50020fc9777fb548d5e1560d8 | |
| parent | 70a2bfdb4dc984c4af30d0fb05a9ea18860d7602 (diff) | |
| download | LibAudio-282c6c12c14bd51cd4dc1468a5d81b4369ed076b.zip LibAudio-282c6c12c14bd51cd4dc1468a5d81b4369ed076b.tar.gz LibAudio-282c6c12c14bd51cd4dc1468a5d81b4369ed076b.tar.bz2 | |
LibAudio: fit for o-mr1 api [5/11]
PD# 157786
fit for o-mr1 api
Change-Id: I02d805181f7432f603941f4d4361c5bb540cd75b
| -rw-r--r-- | amadec/Android.mk | 19 | ||||
| -rw-r--r-- | amadec/omx_audio/Android.mk | 4 | ||||
| -rw-r--r-- | amadec/omx_audio/Android.mk.bak | 31 | ||||
| -rw-r--r-- | amadec/omx_audio/adec_omx.cpp | 4 |
4 files changed, 14 insertions, 44 deletions
diff --git a/amadec/Android.mk b/amadec/Android.mk index 2cb7d24..68e9252 100644 --- a/amadec/Android.mk +++ b/amadec/Android.mk @@ -161,19 +161,20 @@ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/omx_audio/../include \ $(AMAVUTILS_INCLUDE) \ frameworks/native/include/media/openmax \ + frameworks/native/libs/nativewindow/include/system \ frameworks/av/include/media/stagefright \ frameworks/native/include/utils LOCAL_SRC_FILES := \ - /omx_audio/adec_omx.cpp \ - /omx_audio/audio_mediasource.cpp \ - /omx_audio/DDP_mediasource.cpp \ - /omx_audio/ALAC_mediasource.cpp \ - /omx_audio/MP3_mediasource.cpp \ - /omx_audio/ASF_mediasource.cpp \ - /omx_audio/DTSHD_mediasource.cpp \ - /omx_audio/Vorbis_mediasource.cpp \ - /omx_audio/THD_mediasource.cpp + /omx_audio/adec_omx.cpp \ + /omx_audio/audio_mediasource.cpp \ + /omx_audio/DDP_mediasource.cpp \ + /omx_audio/ALAC_mediasource.cpp \ + /omx_audio/MP3_mediasource.cpp \ + /omx_audio/ASF_mediasource.cpp \ + /omx_audio/DTSHD_mediasource.cpp \ + /omx_audio/Vorbis_mediasource.cpp \ + /omx_audio/THD_mediasource.cpp LOCAL_MODULE := libamadec_omx_api LOCAL_MODULE_TAGS := optional diff --git a/amadec/omx_audio/Android.mk b/amadec/omx_audio/Android.mk index a2de292..e53d6b9 100644 --- a/amadec/omx_audio/Android.mk +++ b/amadec/omx_audio/Android.mk @@ -10,12 +10,12 @@ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../include \ frameworks/native/include/media/openmax \ + frameworks/native/libs/nativewindow/include/system \ frameworks/av/include/media/stagefright \ frameworks/native/include/utils LOCAL_SRC_FILES := \ - adec_omx.cpp audio_mediasource.cpp - #../adec_read.c + adec_omx.cpp audio_mediasource.cpp LOCAL_MODULE := libamadec_omx_api diff --git a/amadec/omx_audio/Android.mk.bak b/amadec/omx_audio/Android.mk.bak deleted file mode 100644 index 458961b..0000000 --- a/amadec/omx_audio/Android.mk.bak +++ b/dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_CFLAGS := \ - -fPIC -D_POSIX_SOURCE -DDOLBY_DDPDEC51_MULTICHANNEL_ENDPOINT - -LOCAL_C_INCLUDES:= \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../ \ - $(LOCAL_PATH)/../include \ - frameworks/native/include/media/openmax \ - frameworks/av/include/media/stagefright \ - frameworks/native/include/utils - -LOCAL_SRC_FILES := \ - adec_omx.cpp audio_mediasource.cpp - #../adec_read.c - -LOCAL_MODULE := libamadec_omx_api - -LOCAL_ARM_MODE := arm - -LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc libstagefright \ - libstagefright_omx libstagefright_yuv libmedia_native liblog \ - libstagefright_foundation - -LOCAL_PRELINK_MODULE := false -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/amadec/omx_audio/adec_omx.cpp b/amadec/omx_audio/adec_omx.cpp index 952ba6d..33ef5db 100644 --- a/amadec/omx_audio/adec_omx.cpp +++ b/amadec/omx_audio/adec_omx.cpp @@ -104,9 +104,9 @@ AmlOMXCodec::AmlOMXCodec(int codec_type,void *read_buffer,int *exit,aml_audio_de metadata->setCString(kKeyMIMEType,mine_type); m_codec = SimpleDecodingSource::Create( - m_OMXMediaSource, + m_OMXMediaSource/*, 0, - 0); + 0*/); if (m_codec != NULL) { |