summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-11-19 01:28:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-19 01:28:28 +0000
commit5ea5b020b311a68f513d4a40aca5551abc6a07d8 (patch)
treeb55283398ed05da2ed07b3ce50e0575483b9a447 /include
parent246053380a9f628405a29a055a3f1f4fba13ed5b (diff)
parent4dd0a8a3d66c2853faf2834565b3c5df4f68734d (diff)
downloadframeworks_av-5ea5b020b311a68f513d4a40aca5551abc6a07d8.zip
frameworks_av-5ea5b020b311a68f513d4a40aca5551abc6a07d8.tar.gz
frameworks_av-5ea5b020b311a68f513d4a40aca5551abc6a07d8.tar.bz2
Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index e796ab3..7395055 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();