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
diff --git a/media/codec2/hal/client/client.cpp b/media/codec2/hal/client/client.cpp
index 0bf96cf..01fc593 100644
--- a/media/codec2/hal/client/client.cpp
+++ b/media/codec2/hal/client/client.cpp
@@ -1683,8 +1683,8 @@
uint64_t consumerUsage = kDefaultConsumerUsage;
{
if (surface) {
- uint64_t usage = 0;
- status_t err = surface->getConsumerUsage(&usage);
+ int usage = 0;
+ status_t err = surface->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage);
if (err != NO_ERROR) {
ALOGD("setOutputSurface -- failed to get consumer usage bits (%d/%s). ignoring",
err, asString(err));
@@ -1697,7 +1697,8 @@
// they do not exist inside of C2 scope. Any buffer usage shall be communicated
// through the sideband channel.
- consumerUsage = usage | kDefaultConsumerUsage;
+ // do an unsigned conversion as bit-31 may be 1
+ consumerUsage = (uint32_t)usage | kDefaultConsumerUsage;
}
}
diff --git a/media/codec2/hal/hidl/1.0/utils/InputSurfaceConnection.cpp b/media/codec2/hal/hidl/1.0/utils/InputSurfaceConnection.cpp
index d3fdd6b..7c2e014 100644
--- a/media/codec2/hal/hidl/1.0/utils/InputSurfaceConnection.cpp
+++ b/media/codec2/hal/hidl/1.0/utils/InputSurfaceConnection.cpp
@@ -145,7 +145,7 @@
// C2AndroidMemoryUsage(C2MemoryUsage(usage.value)).
// asGrallocUsage();
- uint64_t grallocUsage =
+ uint32_t grallocUsage =
mSinkName.compare(0, 11, "c2.android.") == 0 ?
GRALLOC_USAGE_SW_READ_OFTEN :
GRALLOC_USAGE_HW_VIDEO_ENCODER;
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;
}
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)));