diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-19 20:46:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 20:46:50 +0000 |
| commit | 91cea7023fdfde5432d5bc128b8c3a9b09dc0e72 (patch) | |
| tree | ff1e9512f313efa81e5ad1fe9b4f9d99d3721490 | |
| parent | b28f7445376442c64973c0193b374f919781f105 (diff) | |
| parent | 08298357a2fb8fe9574a32187c68f34ec356e3a8 (diff) | |
| download | frameworks_av-91cea7023fdfde5432d5bc128b8c3a9b09dc0e72.zip frameworks_av-91cea7023fdfde5432d5bc128b8c3a9b09dc0e72.tar.gz frameworks_av-91cea7023fdfde5432d5bc128b8c3a9b09dc0e72.tar.bz2 | |
am 08298357: am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"
* commit '08298357a2fb8fe9574a32187c68f34ec356e3a8':
Use libaudioresampler instead of libaudioflinger
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 5 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 5 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/VideoEditorResampler.cpp | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 77a21ac..8318d28 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -46,7 +46,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ - libaudioflinger \ + libaudioresampler \ libaudioutils \ libbinder \ libcutils \ @@ -80,7 +80,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/services/audioflinger \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/frameworks/native/services/audioflinger LOCAL_SHARED_LIBRARIES += libdl @@ -99,8 +98,6 @@ LOCAL_CFLAGS += -Wno-multichar \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER -LOCAL_32_BIT_ONLY := true - include $(BUILD_SHARED_LIBRARY) #include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 8856c41..47627ec 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -53,7 +53,7 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := \ - libaudioflinger \ + libaudioresampler \ libaudioutils \ libbinder \ libcutils \ @@ -81,7 +81,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/av/services/audioflinger \ $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/frameworks/native/services/audioflinger \ $(TOP)/system/media/audio_effects/include \ $(TOP)/system/media/audio_utils/include @@ -96,6 +95,4 @@ LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING -LOCAL_32_BIT_ONLY := true - include $(BUILD_SHARED_LIBRARY) diff --git a/libvideoeditor/vss/src/VideoEditorResampler.cpp b/libvideoeditor/vss/src/VideoEditorResampler.cpp index 1129c3c..53537f0 100755 --- a/libvideoeditor/vss/src/VideoEditorResampler.cpp +++ b/libvideoeditor/vss/src/VideoEditorResampler.cpp @@ -17,7 +17,7 @@ #define LOG_NDEBUG 1 #include <audio_utils/primitives.h> #include <utils/Log.h> -#include "AudioMixer.h" +#include "AudioResampler.h" #include "VideoEditorResampler.h" namespace android { diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index a060c0d..9188942 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -64,6 +64,4 @@ LOCAL_MODULE:= libvideoeditor_stagefrightshells LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true - include $(BUILD_STATIC_LIBRARY) |