diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-20 23:19:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:19:33 +0000 |
| commit | b2dcde52135578916b5c68e7ee9779e93881e99b (patch) | |
| tree | b0725ea55cbb6e000b3ba5c07ea1217ba23ca283 | |
| parent | 325c4c9aa74f7238d834465b5ac85f6d3531c8ba (diff) | |
| parent | eb0ad057628f18bf762084b5bbefa81c3a228e3f (diff) | |
| download | frameworks_native-b2dcde52135578916b5c68e7ee9779e93881e99b.zip frameworks_native-b2dcde52135578916b5c68e7ee9779e93881e99b.tar.gz frameworks_native-b2dcde52135578916b5c68e7ee9779e93881e99b.tar.bz2 | |
am eb0ad057: am a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
* commit 'eb0ad057628f18bf762084b5bbefa81c3a228e3f':
omx: add (temporary) index for automatic video frc support
Fix issue #18356768: some app process may hang at Runtime#exit...
| -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, |