diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-20 06:44:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 06:44:42 +0000 |
| commit | a63caa1983138e561b2b033c5d178636beeb1578 (patch) | |
| tree | 740a74cb25331521506dacb70772267d62afcfc0 | |
| parent | 6b9454d1fee0347711af1746642aa7820b1ea04d (diff) | |
| parent | 76d4c5cf733bbc15026611d555eb1497e5ab25d4 (diff) | |
| download | frameworks_native-a63caa1983138e561b2b033c5d178636beeb1578.zip frameworks_native-a63caa1983138e561b2b033c5d178636beeb1578.tar.gz frameworks_native-a63caa1983138e561b2b033c5d178636beeb1578.tar.bz2 | |
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
| -rw-r--r-- | include/media/openmax/OMX_AsString.h | 2 | ||||
| -rw-r--r-- | include/media/openmax/OMX_IndexExt.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h index 18e1e52..0f177a1 100644 --- a/include/media/openmax/OMX_AsString.h +++ b/include/media/openmax/OMX_AsString.h @@ -520,7 +520,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { case OMX_IndexParamVideoAndroidVp8Encoder: return "ParamVideoAndroidVp8Encoder"; case OMX_IndexParamVideoHevc: return "ParamVideoHevc"; // case OMX_IndexParamSliceSegments: return "ParamSliceSegments"; -// case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion"; + case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion"; default: return asString((OMX_INDEXTYPE)i, def); } } diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h index 6cd774b..699efcb 100644 --- a/include/media/openmax/OMX_IndexExt.h +++ b/include/media/openmax/OMX_IndexExt.h @@ -81,6 +81,7 @@ typedef enum OMX_INDEXEXTTYPE { /* Other configurations */ OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000, + OMX_IndexConfigAutoFramerateConversion, /**< reference: OMX_CONFIG_BOOLEANTYPE */ /* Time configurations */ OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, |