commit 5099027f2c6034857ce41be5a30bbe8979cc2a9e
author Ian Kasprzak <iankaz@google.com> Fri Aug 11 16:31:50 2023 +0000
committer Ian Kasprzak <iankaz@google.com> Fri Aug 11 18:35:12 2023 +0000
tree c4e0a0f7db3c001ed56a6144c56c1f7612d6c1fa
parent b6caaf8dd20f4e79ccf74b6ac65ed2e52b70d4e5

Revert "GraphicBufferSource: Use 64bit consumer usage"

This reverts commit b6caaf8dd20f4e79ccf74b6ac65ed2e52b70d4e5.

Reason for revert: b/295498401- AOSP phones not booting

Passing with revert: go/forrest-run/L01600000962534617

Change-Id: I856c6e303cad907c05e522bcd76672b2104ee19f

media/codec2/sfplugin/C2OMXNode.cpp

diff --git a/media/codec2/sfplugin/C2OMXNode.cpp b/media/codec2/sfplugin/C2OMXNode.cpp
index 92cfe31..ed7d69c 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/sfplugin/C2OMXNode.cpp
@@ -230,12 +230,6 @@
             err = OK;
             break;
         }
-        case OMX_IndexParamConsumerUsageBits64: {
-            OMX_U64 *usage = (OMX_U64 *)params;
-            *usage = mUsage;
-            err = OK;
-            break;
-        }
         case OMX_IndexParamPortDefinition: {
             if (size < sizeof(OMX_PARAM_PORTDEFINITIONTYPE)) {
                 return BAD_VALUE;
@@ -299,13 +293,6 @@
             }
             mUsage = *((OMX_U32 *)params);
             return OK;
-
-        case OMX_IndexParamConsumerUsageBits64:
-            if (size != sizeof(OMX_U64)) {
-                return BAD_VALUE;
-            }
-            mUsage = *((OMX_U64 *)params);
-            return OK;
     }
     return ERROR_UNSUPPORTED;
 }

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 8013f8e..6295b06 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -206,19 +206,12 @@
         mNode = new C2OMXNode(comp);
         mOmxNode = new hardware::media::omx::V1_0::utils::TWOmxNode(mNode);
         mNode->setFrameSize(mWidth, mHeight);
-        // Usage is queried during configure(), so setting it beforehand.
-        // 64 bit set parameter is existing only in C2OMXNode.
-        OMX_U64 usage64 = mConfig.mUsage;
-        status_t res = mNode->setParameter(
-                (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits64,
-                &usage64, sizeof(usage64));
 
-        if (res != OK) {
-            OMX_U32 usage = mConfig.mUsage & 0xFFFFFFFF;
-            (void)mNode->setParameter(
-                    (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits,
-                    &usage, sizeof(usage));
-        }
+        // Usage is queried during configure(), so setting it beforehand.
+        OMX_U32 usage = mConfig.mUsage & 0xFFFFFFFF;
+        (void)mNode->setParameter(
+                (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits,
+                &usage, sizeof(usage));
 
         return GetStatus(mSource->configure(
                 mOmxNode, static_cast<hardware::graphics::common::V1_0::Dataspace>(mDataSpace)));