diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 14:09:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 14:09:03 -0800 |
| commit | d12dc28460f622ab29e83fa688ad83a8263e9417 (patch) | |
| tree | 47fa98e5e289300bbb65f48af427b4d6d68fa54b /include/media | |
| parent | 351143fb0e2fcfb7dc2ef1045d693c71eb0ea329 (diff) | |
| parent | d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5 (diff) | |
| download | frameworks_base-d12dc28460f622ab29e83fa688ad83a8263e9417.zip frameworks_base-d12dc28460f622ab29e83fa688ad83a8263e9417.tar.gz frameworks_base-d12dc28460f622ab29e83fa688ad83a8263e9417.tar.bz2 | |
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 5822877..3963d9c 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -166,6 +166,8 @@ private: bool allYourBuffersAreBelongToUs(); + size_t countBuffersOwnedByComponent(OMX_U32 portIndex) const; + void deferMessage(const sp<AMessage> &msg); void processDeferredMessages(); |