summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-05-01 20:07:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-01 20:07:50 +0000
commit2b0b701f57c5efebe868d0eedce8cfc399007e8a (patch)
treeb66b4dc66e16492f5a867c32e2b3d8d92958b8b3 /media/libstagefright
parent1afedc4d99acd52f99221d71b3a372a0a5497a84 (diff)
parent0c388650722ac53571be21ee04ce342c1c9510c2 (diff)
downloadframeworks_av-2b0b701f57c5efebe868d0eedce8cfc399007e8a.zip
frameworks_av-2b0b701f57c5efebe868d0eedce8cfc399007e8a.tar.gz
frameworks_av-2b0b701f57c5efebe868d0eedce8cfc399007e8a.tar.bz2
am 0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '0c388650722ac53571be21ee04ce342c1c9510c2': ACodec: add frame render/drop systrace
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/ACodec.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 2d04bbb..f5fb622 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>
@@ -3443,6 +3445,7 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {
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;
@@ -3455,6 +3458,10 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {
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;
}