Merge changes from topic "reland-64bit-omx" into main am: f67a94c5d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2706715
Change-Id: I530c45f50eb9ecf296060b567f6ab8ece9a5e822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/hal/client/client.cpp b/media/codec2/hal/client/client.cpp
index b0ce733..00820eb 100644
--- a/media/codec2/hal/client/client.cpp
+++ b/media/codec2/hal/client/client.cpp
@@ -1850,8 +1850,8 @@
uint64_t consumerUsage = kDefaultConsumerUsage;
{
if (surface) {
- int usage = 0;
- status_t err = surface->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage);
+ uint64_t usage = 0;
+ status_t err = surface->getConsumerUsage(&usage);
if (err != NO_ERROR) {
ALOGD("setOutputSurface -- failed to get consumer usage bits (%d/%s). ignoring",
err, asString(err));
@@ -1864,8 +1864,7 @@
// they do not exist inside of C2 scope. Any buffer usage shall be communicated
// through the sideband channel.
- // do an unsigned conversion as bit-31 may be 1
- consumerUsage = (uint32_t)usage | kDefaultConsumerUsage;
+ consumerUsage = 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 7c2e014..d3fdd6b 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();
- uint32_t grallocUsage =
+ uint64_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 ed7d69c..92cfe31 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/sfplugin/C2OMXNode.cpp
@@ -230,6 +230,12 @@
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;
@@ -293,6 +299,13 @@
}
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 6295b06..8013f8e 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -206,12 +206,19 @@
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.
- OMX_U32 usage = mConfig.mUsage & 0xFFFFFFFF;
- (void)mNode->setParameter(
- (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits,
- &usage, sizeof(usage));
+ // 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));
+ }
return GetStatus(mSource->configure(
mOmxNode, static_cast<hardware::graphics::common::V1_0::Dataspace>(mDataSpace)));
diff --git a/media/libmedia/include/media/omx/1.0/Conversion.h b/media/libmedia/include/media/omx/1.0/Conversion.h
index 70217d5..af25015 100644
--- a/media/libmedia/include/media/omx/1.0/Conversion.h
+++ b/media/libmedia/include/media/omx/1.0/Conversion.h
@@ -606,8 +606,16 @@
t->attr.height = l.getHeight();
t->attr.stride = l.getStride();
t->attr.format = static_cast<PixelFormat>(l.getPixelFormat());
- t->attr.layerCount = l.getLayerCount();
- t->attr.usage = l.getUsage();
+ // HACK
+ // anwBuffer.layerCount 8 bytes : GraphicBuffer::layerCount 4 bytes
+ // anwBuffer.usage 4 bytes : GraphicBuffer::usage 8 bytes
+ // We would like to retain high part of usage with high part of layerCount
+ uint64_t usage = l.getUsage();
+ uint32_t usageHigh = (usage >> 32);
+ uint32_t usageLow = (0xFFFFFFFF & usage);
+ uint32_t layerLow = l.getLayerCount();
+ t->attr.layerCount = ((uint64_t(usageHigh) << 32) | layerLow);
+ t->attr.usage = usageLow;
t->attr.id = l.getId();
t->attr.generationNumber = l.getGenerationNumber();
t->nativeHandle = hidl_handle(l.handle);
@@ -637,30 +645,37 @@
}
}
- size_t const numInts = 12 + (handle ? handle->numInts : 0);
+ size_t const numInts = 13 + (handle ? handle->numInts : 0);
int32_t* ints = new int32_t[numInts];
size_t numFds = static_cast<size_t>(handle ? handle->numFds : 0);
int* fds = new int[numFds];
- ints[0] = 'GBFR';
+ ints[0] = 'GB01';
ints[1] = static_cast<int32_t>(t.attr.width);
ints[2] = static_cast<int32_t>(t.attr.height);
ints[3] = static_cast<int32_t>(t.attr.stride);
ints[4] = static_cast<int32_t>(t.attr.format);
- ints[5] = static_cast<int32_t>(t.attr.layerCount);
+ // HACK
+ // anwBuffer.layerCount 8 bytes : GraphicBuffer::layerCount 4 bytes
+ // anwBuffer.usage 4 bytes : GraphicBuffer::usage 8 bytes
+ // We would like to retain high part of usage with high part of layerCount
+ uint32_t layer = (0xFFFFFFFF & t.attr.layerCount);
+ uint32_t usageHigh = (t.attr.layerCount >> 32);
+ ints[5] = layer;
ints[6] = static_cast<int32_t>(t.attr.usage);
ints[7] = static_cast<int32_t>(t.attr.id >> 32);
ints[8] = static_cast<int32_t>(t.attr.id & 0xFFFFFFFF);
ints[9] = static_cast<int32_t>(t.attr.generationNumber);
ints[10] = 0;
ints[11] = 0;
+ ints[12] = usageHigh;
if (handle) {
ints[10] = static_cast<int32_t>(handle->numFds);
ints[11] = static_cast<int32_t>(handle->numInts);
int* intsStart = handle->data + handle->numFds;
std::copy(handle->data, intsStart, fds);
- std::copy(intsStart, intsStart + handle->numInts, &ints[12]);
+ std::copy(intsStart, intsStart + handle->numInts, &ints[13]);
}
void const* constBuffer = static_cast<void const*>(ints);
diff --git a/media/libstagefright/omx/1.0/WGraphicBufferSource.cpp b/media/libstagefright/omx/1.0/WGraphicBufferSource.cpp
index f7bf3ba..f4ccaba 100644
--- a/media/libstagefright/omx/1.0/WGraphicBufferSource.cpp
+++ b/media/libstagefright/omx/1.0/WGraphicBufferSource.cpp
@@ -143,7 +143,7 @@
// use consumer usage bits queried from encoder, but always add
// HW_VIDEO_ENCODER for backward compatibility.
- uint32_t consumerUsage;
+ uint64_t consumerUsage;
void *_params = &consumerUsage;
uint8_t *params = static_cast<uint8_t*>(_params);
fnStatus = UNKNOWN_ERROR;
@@ -155,15 +155,32 @@
outParams.data() + outParams.size(),
params);
});
+
+ // try 64 bit consumer usage first
auto transStatus = omxNode->getParameter(
- static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits),
+ static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits64),
inHidlBytes(&consumerUsage, sizeof(consumerUsage)),
_hidl_cb);
if (!transStatus.isOk()) {
return toStatus(FAILED_TRANSACTION);
}
if (fnStatus != OK) {
- consumerUsage = 0;
+ // try 32 bit consumer usage upon failure
+ uint32_t usage;
+ _params = &usage;
+ params = static_cast<uint8_t*>(_params);
+ transStatus = omxNode->getParameter(
+ static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits),
+ inHidlBytes(&usage, sizeof(usage)),
+ _hidl_cb);
+ if (!transStatus.isOk()) {
+ return toStatus(FAILED_TRANSACTION);
+ }
+ if (fnStatus != OK) {
+ consumerUsage = 0;
+ } else {
+ consumerUsage = usage;
+ }
}
OMX_PARAM_PORTDEFINITIONTYPE def;
diff --git a/media/libstagefright/omx/OmxGraphicBufferSource.cpp b/media/libstagefright/omx/OmxGraphicBufferSource.cpp
index 9484046..5d653bc 100644
--- a/media/libstagefright/omx/OmxGraphicBufferSource.cpp
+++ b/media/libstagefright/omx/OmxGraphicBufferSource.cpp
@@ -86,6 +86,18 @@
uint32_t frameWidth,
uint32_t frameHeight,
uint32_t consumerUsage) {
+ uint64_t consumerUsage64 = static_cast<uint64_t>(consumerUsage);
+ return configure(omxNode, dataSpace, bufferCount,
+ frameWidth, frameHeight, consumerUsage64);
+}
+
+status_t OmxGraphicBufferSource::configure(
+ const sp<IOmxNodeWrapper>& omxNode,
+ int32_t dataSpace,
+ int32_t bufferCount,
+ uint32_t frameWidth,
+ uint32_t frameHeight,
+ uint64_t consumerUsage) {
if (omxNode == NULL) {
return BAD_VALUE;
}
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
index cf236d8..a6e23ed 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
@@ -425,8 +425,16 @@
t->attr.anwBuffer.stride = graphicBuffer->getStride();
t->attr.anwBuffer.format = static_cast<PixelFormat>(
graphicBuffer->getPixelFormat());
- t->attr.anwBuffer.layerCount = graphicBuffer->getLayerCount();
- t->attr.anwBuffer.usage = graphicBuffer->getUsage();
+ // HACK
+ // anwBuffer.layerCount 8 bytes : GraphicBuffer::layerCount 4 bytes
+ // anwBuffer.usage 4 bytes : GraphicBuffer::usage 8 bytes
+ // We would like to retain high part of usage with high part of layerCount
+ uint64_t usage = graphicBuffer->getUsage();
+ uint32_t usageHigh = (usage >> 32);
+ uint32_t usageLow = (0xFFFFFFFF & usage);
+ uint32_t layerLow = graphicBuffer->getLayerCount();
+ t->attr.anwBuffer.layerCount = ((uint64_t(usageHigh) << 32) | layerLow);
+ t->attr.anwBuffer.usage = usageLow;
t->nativeHandle = graphicBuffer->handle;
return t;
}
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h b/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h
index e576d75..8b920c1 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h
@@ -63,7 +63,9 @@
// ------------------------------
// Configure the buffer source to be used with an OMX node with the default
- // data space.
+ // data space.(32-bit consumerUsage flag, for vendor partition
+ // compatibility)
+ [[deprecated("use configure() with a 64-bit consumerUsage flag instead")]]
status_t configure(
const sp<IOmxNodeWrapper> &omxNode,
int32_t dataSpace,
@@ -72,6 +74,16 @@
uint32_t frameHeight,
uint32_t consumerUsage);
+ // Configure the buffer source to be used with an OMX node with the default
+ // data space. (64-bit consumerUsage flag)
+ status_t configure(
+ const sp<IOmxNodeWrapper> &omxNode,
+ int32_t dataSpace,
+ int32_t bufferCount,
+ uint32_t frameWidth,
+ uint32_t frameHeight,
+ uint64_t consumerUsage);
+
// Rest of the interface in GraphicBufferSource.
private:
diff --git a/media/module/bqhelper/GraphicBufferSource.cpp b/media/module/bqhelper/GraphicBufferSource.cpp
index 569420b..82ddbc0 100644
--- a/media/module/bqhelper/GraphicBufferSource.cpp
+++ b/media/module/bqhelper/GraphicBufferSource.cpp
@@ -1151,6 +1151,18 @@
uint32_t frameWidth,
uint32_t frameHeight,
uint32_t consumerUsage) {
+ uint64_t consumerUsage64 = static_cast<uint64_t>(consumerUsage);
+ return configure(component, dataSpace, bufferCount,
+ frameWidth, frameHeight, consumerUsage64);
+}
+
+status_t GraphicBufferSource::configure(
+ const sp<ComponentWrapper>& component,
+ int32_t dataSpace,
+ int32_t bufferCount,
+ uint32_t frameWidth,
+ uint32_t frameHeight,
+ uint64_t consumerUsage) {
if (component == NULL) {
return BAD_VALUE;
}
diff --git a/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h b/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h
index fe6bcce..5225a48 100644
--- a/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h
+++ b/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h
@@ -122,7 +122,9 @@
// ------------------------------
// Configure the buffer source to be used with a component with the default
- // data space.
+ // data space. (32-bit consumerUsage flag, for vendor partition
+ // compatibility)
+ [[deprecated("use configure() with a 64-bit consumerUsage flag instead")]]
status_t configure(
const sp<ComponentWrapper> &component,
int32_t dataSpace,
@@ -131,6 +133,16 @@
uint32_t frameHeight,
uint32_t consumerUsage);
+ // Configure the buffer source to be used with a component with the default
+ // data space. (64-bit consumerUsage flag)
+ status_t configure(
+ const sp<ComponentWrapper> &component,
+ int32_t dataSpace,
+ int32_t bufferCount,
+ uint32_t frameWidth,
+ uint32_t frameHeight,
+ uint64_t consumerUsage);
+
// This is called after the last input frame has been submitted or buffer
// timestamp is greater or equal than stopTimeUs. We need to submit an empty
// buffer with the EOS flag set. If we don't have a codec buffer ready,