diff options
| author | 2023-08-23 17:56:42 +0000 | |
|---|---|---|
| committer | 2023-08-23 17:56:42 +0000 | |
| commit | 7a75c8dc31bd08fe0479cbea6761f47aef0fd031 (patch) | |
| tree | 43d0c85b552efa66b205d179fc6fda92f47d68aa | |
| parent | 1d43ec1c2b5d167e46745c7b8d0ca703ca2fafa3 (diff) | |
| parent | 5212dc5c30cb73ac817a6169340d3a87de69c3ef (diff) | |
Merge "RELAND "OMX: Add 64bit consumer usage flag parameter"" into main am: 5212dc5c30
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2706282
Change-Id: Ie6750dac6cf9c8706d213fe733fa446a2f83ce83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | headers/media_plugin/media/openmax/OMX_AsString.h | 1 | ||||
| -rw-r--r-- | headers/media_plugin/media/openmax/OMX_IndexExt.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/headers/media_plugin/media/openmax/OMX_AsString.h b/headers/media_plugin/media/openmax/OMX_AsString.h index ce30b417e0..165a868d57 100644 --- a/headers/media_plugin/media/openmax/OMX_AsString.h +++ b/headers/media_plugin/media/openmax/OMX_AsString.h @@ -561,6 +561,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { case OMX_IndexConfigPriority: return "ConfigPriority"; case OMX_IndexConfigOperatingRate: return "ConfigOperatingRate"; case OMX_IndexParamConsumerUsageBits: return "ParamConsumerUsageBits"; + case OMX_IndexParamConsumerUsageBits64: return "ParamConsumerUsageBits64"; case OMX_IndexConfigLatency: return "ConfigLatency"; default: return asString((OMX_INDEXTYPE)i, def); } diff --git a/headers/media_plugin/media/openmax/OMX_IndexExt.h b/headers/media_plugin/media/openmax/OMX_IndexExt.h index 0af40dd28e..5ddd719ba1 100644 --- a/headers/media_plugin/media/openmax/OMX_IndexExt.h +++ b/headers/media_plugin/media/openmax/OMX_IndexExt.h @@ -105,6 +105,7 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexConfigLowLatency, /**< reference: OMX_CONFIG_BOOLEANTYPE */ OMX_IndexConfigAndroidTunnelPeek, /**< reference: OMX_CONFIG_BOOLEANTYPE */ OMX_IndexConfigAndroidTunnelPeekLegacyMode, /**< reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexParamConsumerUsageBits64, /**< reference: OMX_PARAM_U64TYPE */ OMX_IndexExtOtherEndUnused, /* Time configurations */ |