diff options
| author | Lajos Molnar <lajos@google.com> | 2014-05-01 20:10:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 20:10:08 +0000 |
| commit | ee46bd378b7a68789be9c85d8a59fa02d4aed030 (patch) | |
| tree | 78fafcd1b8364cb3587c56beae24c41cbfc5b915 /media/libstagefright | |
| parent | b4eacebfc5c5fd86b20661eab0797ce70c66e323 (diff) | |
| parent | 2b0b701f57c5efebe868d0eedce8cfc399007e8a (diff) | |
| download | frameworks_av-ee46bd378b7a68789be9c85d8a59fa02d4aed030.zip frameworks_av-ee46bd378b7a68789be9c85d8a59fa02d4aed030.tar.gz frameworks_av-ee46bd378b7a68789be9c85d8a59fa02d4aed030.tar.bz2 | |
am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a':
ACodec: add frame render/drop systrace
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 9e1c62a..08a3c7f 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> @@ -3508,6 +3510,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; @@ -3520,6 +3523,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; } |