ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev

Browse Source 
* commit 'a63caa1983138e561b2b033c5d178636beeb1578':
  omx: add (temporary) index for automatic video frc support
  Fix issue #18356768: some app process may hang at Runtime#exit...
This commit is contained in:
Lajos Molnar 2014-11-20 23:05:47 +00:00 committed by Android Git Automerger
commit eb0ad05762
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/media/openmax/OMX_AsString.h
View File

@ -520,7 +520,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") {
case OMX_IndexParamVideoAndroidVp8Encoder: return "ParamVideoAndroidVp8Encoder"; case OMX_IndexParamVideoAndroidVp8Encoder: return "ParamVideoAndroidVp8Encoder";
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";
default: return asString((OMX_INDEXTYPE)i, def); default: return asString((OMX_INDEXTYPE)i, def);
} }
} }

1
include/media/openmax/OMX_IndexExt.h
View File

@ -81,6 +81,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 */
/* Time configurations */ /* Time configurations */
OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,