commit 88014186c34dbc5c8f4cdf0936cae2a36e4b61ac
author Lajos Molnar <lajos@google.com> Thu May 01 20:12:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 20:12:34 2014 +0000
tree 8eb907919db111a5cb1eabc623a045b8036d913d
parent ee7a5ef61b8d1149811ee73c80aca2ac8474d559
parent ee46bd378b7a68789be9c85d8a59fa02d4aed030

am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit 'ee46bd378b7a68789be9c85d8a59fa02d4aed030':
  ACodec: add frame render/drop systrace

media/libstagefright/ACodec.cpp

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;
     }