diff options
| author | Lajos Molnar <lajos@google.com> | 2015-06-26 15:21:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-26 15:21:01 +0000 |
| commit | 84112b0999aabd40da77d13d1663074679f82a82 (patch) | |
| tree | dc9f2cf29b4da5559bd84204e1ef2a57d4f434e5 | |
| parent | c914ea6b489b1352a678d38ee9d88330c9c7ef4c (diff) | |
| parent | 3875698f8d47af86e024817889e4107392d20439 (diff) | |
| download | frameworks_native-84112b0999aabd40da77d13d1663074679f82a82.zip frameworks_native-84112b0999aabd40da77d13d1663074679f82a82.tar.gz frameworks_native-84112b0999aabd40da77d13d1663074679f82a82.tar.bz2 | |
am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit '3875698f8d47af86e024817889e4107392d20439':
omx: add OMX_IndexParamConsumerUsageBits
| -rw-r--r-- | include/media/openmax/OMX_AsString.h | 1 | ||||
| -rw-r--r-- | include/media/openmax/OMX_IndexExt.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h index 65eb562..ae8430d 100644 --- a/include/media/openmax/OMX_AsString.h +++ b/include/media/openmax/OMX_AsString.h @@ -524,6 +524,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion"; case OMX_IndexConfigPriority: return "ConfigPriority"; case OMX_IndexConfigOperatingRate: return "ConfigOperatingRate"; + case OMX_IndexParamConsumerUsageBits: return "ParamConsumerUsageBits"; default: return asString((OMX_INDEXTYPE)i, def); } } diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h index 51bba31..25bea1f 100644 --- a/include/media/openmax/OMX_IndexExt.h +++ b/include/media/openmax/OMX_IndexExt.h @@ -85,6 +85,7 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexConfigAutoFramerateConversion, /**< reference: OMX_CONFIG_BOOLEANTYPE */ OMX_IndexConfigPriority, /**< reference: OMX_PARAM_U32TYPE */ OMX_IndexConfigOperatingRate, /**< reference: OMX_PARAM_U32TYPE in Q16 format for video and in Hz for audio */ + OMX_IndexParamConsumerUsageBits, /**< reference: OMX_PARAM_U32TYPE */ /* Time configurations */ OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, |