diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-10 20:10:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-10 20:10:42 +0000 |
| commit | 4b7bfa48ffe3b2d82b46db88cfaca0e909915efa (patch) | |
| tree | fd6449afa58113b1673ecc7d84030e41410c4955 /include/media | |
| parent | e734e751bd115c15609bc2e5c59789b21d4e9cae (diff) | |
| parent | a39c205f87c6feebefc4a73043c3b1278373dbd3 (diff) | |
| download | frameworks_native-4b7bfa48ffe3b2d82b46db88cfaca0e909915efa.zip frameworks_native-4b7bfa48ffe3b2d82b46db88cfaca0e909915efa.tar.gz frameworks_native-4b7bfa48ffe3b2d82b46db88cfaca0e909915efa.tar.bz2 | |
Merge "openmax: add OMX_IndexConfigOperatingRate."
Diffstat (limited to 'include/media')
| -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 dbcecf5..7856c06 100644 --- a/include/media/openmax/OMX_AsString.h +++ b/include/media/openmax/OMX_AsString.h @@ -522,6 +522,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { // case OMX_IndexParamSliceSegments: return "ParamSliceSegments"; case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion"; case OMX_IndexConfigPriority: return "ConfigPriority"; + case OMX_IndexConfigOperatingRate: return "ConfigOperatingRate"; default: return asString((OMX_INDEXTYPE)i, def); } } diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h index 0122a27..51bba31 100644 --- a/include/media/openmax/OMX_IndexExt.h +++ b/include/media/openmax/OMX_IndexExt.h @@ -84,6 +84,7 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000, 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 */ /* Time configurations */ OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, |