diff options
| author | Lajos Molnar <lajos@google.com> | 2013-11-18 17:37:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-18 17:37:08 -0800 |
| commit | 704287d1b9427cc39e7be2fc44b0ae21840831e4 (patch) | |
| tree | c070a1ef475304c4517d1792b20d3332e544bcce /include | |
| parent | 3bd2531ac7c87b85bc9f5abf558b5dc247caaa86 (diff) | |
| parent | 72afcd5da296b1f5fb38ef037054855aaea88054 (diff) | |
| download | frameworks_av-704287d1b9427cc39e7be2fc44b0ae21840831e4.zip frameworks_av-704287d1b9427cc39e7be2fc44b0ae21840831e4.tar.gz frameworks_av-704287d1b9427cc39e7be2fc44b0ae21840831e4.tar.bz2 | |
am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev
* commit '72afcd5da296b1f5fb38ef037054855aaea88054':
WA: Queue extra buffers on output port during reconfig if input EOS-ed
Diffstat (limited to 'include')
| -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 2fcfc62..f1636e6 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -116,6 +116,7 @@ private: kWhatStart = 'star', kWhatRequestIDRFrame = 'ridr', kWhatSetParameters = 'setP', + kWhatSubmitOutputMetaDataBufferIfEOS = 'subm', }; enum { @@ -212,6 +213,7 @@ private: OMX_U32 *nMinUndequeuedBuffers); status_t allocateOutputMetaDataBuffers(); status_t submitOutputMetaDataBuffer(); + void signalSubmitOutputMetaDataBufferIfEOS_workaround(); status_t allocateOutputBuffersFromNativeWindow(); status_t cancelBufferToNativeWindow(BufferInfo *info); status_t freeOutputBuffersNotOwnedByComponent(); |