summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-19 09:05:59 -0700
committerGlenn Kasten <gkasten@android.com>2014-03-19 10:55:00 -0700
commit4269fc8068d10fc95780e8a7e1e4d4eb43483883 (patch)
tree756052e8b34fe18b5b90f7cb53f03409de37ccb6 /libvideoeditor
parentddf887c08b58382920effb7f0b2049e471960b4a (diff)
downloadframeworks_av-4269fc8068d10fc95780e8a7e1e4d4eb43483883.zip
frameworks_av-4269fc8068d10fc95780e8a7e1e4d4eb43483883.tar.gz
frameworks_av-4269fc8068d10fc95780e8a7e1e4d4eb43483883.tar.bz2
Use libaudioresampler instead of libaudioflinger
in order to be able to build libvideoeditor as 64-bit also. libaudioresampler is available in both 32-bit and 64-bit, unlike libaudioflinger which is currently 32-bit only. Change-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/lvpp/Android.mk5
-rwxr-xr-xlibvideoeditor/vss/src/Android.mk5
-rwxr-xr-xlibvideoeditor/vss/src/VideoEditorResampler.cpp2
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/Android.mk2
4 files changed, 3 insertions, 11 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk
index f0afbc9..06c2e6a 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 \
@@ -81,7 +81,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
@@ -100,8 +99,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 c603252..e30b85d 100755
--- a/libvideoeditor/vss/stagefrightshells/src/Android.mk
+++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk
@@ -65,6 +65,4 @@ LOCAL_MODULE:= libvideoeditor_stagefrightshells
LOCAL_MODULE_TAGS := optional
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_STATIC_LIBRARY)