commit 9176b3d7eed61e21e292889e88f9bf8e2e19899c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 11 18:44:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 11 18:44:33 2023 +0000
tree 51594e5cadf33fcb1db36d5a888eadc36d03d61c
parent b5c136e70bce4d3b2570efbeeeb033637b0cafe7
parent 9eab6c56aa88e1b6fe2c2eae5da84320875cb295

Merge "Revert "OMX: Add 64bit consumer usage flag parameter"" into main

headers/media_plugin/media/openmax/OMX_AsString.h

diff --git a/headers/media_plugin/media/openmax/OMX_AsString.h b/headers/media_plugin/media/openmax/OMX_AsString.h
index 165a868..ce30b41 100644
--- a/headers/media_plugin/media/openmax/OMX_AsString.h
+++ b/headers/media_plugin/media/openmax/OMX_AsString.h
@@ -561,7 +561,6 @@
         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);
     }

headers/media_plugin/media/openmax/OMX_IndexExt.h

diff --git a/headers/media_plugin/media/openmax/OMX_IndexExt.h b/headers/media_plugin/media/openmax/OMX_IndexExt.h
index 5ddd719..0af40dd 100644
--- a/headers/media_plugin/media/openmax/OMX_IndexExt.h
+++ b/headers/media_plugin/media/openmax/OMX_IndexExt.h
@@ -105,7 +105,6 @@
     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 */