summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-06-22 05:03:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-22 05:03:04 +0000
commit5cecaa9430ef1d721968f1cd621c1c45c52190ce (patch)
tree2923f08f431767fdaee186ecc6c79b2cca21f207 /include
parent81e998b0d1a8f35c2eadce994ab930e83bfc9d0b (diff)
parente421a32aa696cd8abbf8fdc97cc8f37dbf372cac (diff)
downloadframeworks_av-5cecaa9430ef1d721968f1cd621c1c45c52190ce.zip
frameworks_av-5cecaa9430ef1d721968f1cd621c1c45c52190ce.tar.gz
frameworks_av-5cecaa9430ef1d721968f1cd621c1c45c52190ce.tar.bz2
Merge "stagefright: allow state change while handling OMX message list" into mnc-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index f9ea38e..a4b24d7 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -110,6 +110,9 @@ private:
enum {
kWhatSetup = 'setu',
kWhatOMXMessage = 'omx ',
+ // same as kWhatOMXMessage - but only used with
+ // handleMessage during OMX message-list handling
+ kWhatOMXMessageItem = 'omxI',
kWhatOMXMessageList = 'omxL',
kWhatInputBufferFilled = 'inpF',
kWhatOutputBufferDrained = 'outD',