commit 2b0b701f57c5efebe868d0eedce8cfc399007e8a
author Lajos Molnar <lajos@google.com> Thu May 01 20:07:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 20:07:50 2014 +0000
tree b66b4dc66e16492f5a867c32e2b3d8d92958b8b3
parent 1afedc4d99acd52f99221d71b3a372a0a5497a84
parent 0c388650722ac53571be21ee04ce342c1c9510c2

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

* commit '0c388650722ac53571be21ee04ce342c1c9510c2':
  ACodec: add frame render/drop systrace

media/libstagefright/ACodec.cpp

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