diff options
| author | Lajos Molnar <lajos@google.com> | 2015-05-14 19:52:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 19:52:38 +0000 |
| commit | e6858d597ca98ce7e68e10545dfb604ed572d46a (patch) | |
| tree | 696d7e70e9716872079503ba7d57ca19f17c1255 /include | |
| parent | 467b6e152e3064b8da58551effb39e72acec14af (diff) | |
| parent | 0806340688c937e7b78c2d89db3809274130df4e (diff) | |
| download | frameworks_av-e6858d597ca98ce7e68e10545dfb604ed572d46a.zip frameworks_av-e6858d597ca98ce7e68e10545dfb604ed572d46a.tar.gz frameworks_av-e6858d597ca98ce7e68e10545dfb604ed572d46a.tar.bz2 | |
Merge "stagefright: prevent more crashes in ACodec" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 54c57ad..4ed97e5 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -146,8 +146,13 @@ private: OWNED_BY_UPSTREAM, OWNED_BY_DOWNSTREAM, OWNED_BY_NATIVE_WINDOW, + UNRECOGNIZED, // not a tracked buffer }; + static inline Status getSafeStatus(BufferInfo *info) { + return info == NULL ? UNRECOGNIZED : info->mStatus; + } + IOMX::buffer_id mBufferID; Status mStatus; unsigned mDequeuedAt; @@ -156,6 +161,9 @@ private: sp<GraphicBuffer> mGraphicBuffer; }; + static const char *_asString(BufferInfo::Status s); + void dumpBuffers(OMX_U32 portIndex); + #if TRACK_BUFFER_TIMING struct BufferStats { int64_t mEmptyBufferTimeUs; |