Merge "Use AUDIO_INTERLEAVE_* constants"
diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk
index 6ee2884..6747e60 100644
--- a/cmds/screenrecord/Android.mk
+++ b/cmds/screenrecord/Android.mk
@@ -41,6 +41,4 @@
LOCAL_MODULE:= screenrecord
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index e2e389b..561ce02 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -23,8 +23,6 @@
LOCAL_MODULE:= stagefright
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -48,8 +46,6 @@
LOCAL_MODULE:= record
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -73,8 +69,6 @@
LOCAL_MODULE:= recordvideo
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
@@ -99,8 +93,6 @@
LOCAL_MODULE:= audioloop
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -124,8 +116,6 @@
LOCAL_MODULE:= stream
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -149,8 +139,6 @@
LOCAL_MODULE:= sf2
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -175,8 +163,6 @@
LOCAL_MODULE:= codec
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
################################################################################
@@ -200,6 +186,4 @@
LOCAL_MODULE:= muxer
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
diff --git a/media/libmedia/MemoryLeakTrackUtil.cpp b/media/libmedia/MemoryLeakTrackUtil.cpp
index f004ca4..66f7161 100644
--- a/media/libmedia/MemoryLeakTrackUtil.cpp
+++ b/media/libmedia/MemoryLeakTrackUtil.cpp
@@ -17,6 +17,7 @@
#include <media/MemoryLeakTrackUtil.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index f11791c..5bca317 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -17,6 +17,8 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "ACodec"
+#include <utils/Trace.h>
+
#include <media/stagefright/ACodec.h>
#include <binder/MemoryDealer.h>
@@ -3681,6 +3683,7 @@
if (mCodec->mNativeWindow != NULL
&& msg->findInt32("render", &render) && render != 0
&& info->mData != NULL && info->mData->size() != 0) {
+ ATRACE_NAME("render");
// The client wants this buffer to be rendered.
status_t err;
@@ -3693,6 +3696,10 @@
info->mStatus = BufferInfo::OWNED_BY_US;
}
} else {
+ if (mCodec->mNativeWindow != NULL &&
+ (info->mData == NULL || info->mData->size() != 0)) {
+ ATRACE_NAME("frame-drop");
+ }
info->mStatus = BufferInfo::OWNED_BY_US;
}
diff --git a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
index 515e4d3..8f356b6 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -355,7 +355,12 @@
outHeader->nFlags = 0;
int err = vorbis_dsp_synthesis(mState, &pack, 1);
if (err != 0) {
+ // FIXME temporary workaround for log spam
+#if !defined(__arm__) && !defined(__aarch64__)
+ ALOGV("vorbis_dsp_synthesis returned %d", err);
+#else
ALOGW("vorbis_dsp_synthesis returned %d", err);
+#endif
} else {
numFrames = vorbis_dsp_pcmout(
mState, (int16_t *)outHeader->pBuffer,