Merge "openmax: add OMX_IndexConfigPriority."

This commit is contained in:
Ronghua Wu 2015-03-16 16:33:10 +00:00 committed by Android (Google) Code Review
commit 221765d768
2 changed files with 2 additions and 0 deletions

View File

@ -521,6 +521,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") {
case OMX_IndexParamVideoHevc: return "ParamVideoHevc"; case OMX_IndexParamVideoHevc: return "ParamVideoHevc";
// case OMX_IndexParamSliceSegments: return "ParamSliceSegments"; // case OMX_IndexParamSliceSegments: return "ParamSliceSegments";
case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion"; case OMX_IndexConfigAutoFramerateConversion: return "ConfigAutoFramerateConversion";
case OMX_IndexConfigPriority: return "ConfigPriority";
default: return asString((OMX_INDEXTYPE)i, def); default: return asString((OMX_INDEXTYPE)i, def);
} }
} }

View File

@ -83,6 +83,7 @@ typedef enum OMX_INDEXEXTTYPE {
/* Other configurations */ /* Other configurations */
OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000, OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,
OMX_IndexConfigAutoFramerateConversion, /**< reference: OMX_CONFIG_BOOLEANTYPE */ OMX_IndexConfigAutoFramerateConversion, /**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexConfigPriority, /**< reference: OMX_PARAM_U32TYPE */
/* Time configurations */ /* Time configurations */
OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,