Merge "goldfish-opengl: use Mesa provided libraries" into main am: 0e154a94f4 am: b65b24dd32
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/3256979
Change-Id: I0cd5f284699990282f91f0861f32d0d7f52e9612
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
index ef36b3d..d77cba0 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
@@ -723,7 +723,7 @@
mOutBlock.reset();
}
if (!mOutBlock) {
- const uint32_t format = HAL_PIXEL_FORMAT_YV12;
+ const uint32_t format = HAL_PIXEL_FORMAT_YCBCR_420_888;
const C2MemoryUsage usage = {(uint64_t)(BufferUsage::VIDEO_DECODER),
C2MemoryUsage::CPU_WRITE | C2MemoryUsage::CPU_READ};
c2_status_t err = pool->fetchGraphicBlock(ALIGN2(mWidth), mHeight,
diff --git a/system/codecs/c2/decoders/base/color_buffer_utils.cpp b/system/codecs/c2/decoders/base/color_buffer_utils.cpp
index db985d5..86c6eff 100644
--- a/system/codecs/c2/decoders/base/color_buffer_utils.cpp
+++ b/system/codecs/c2/decoders/base/color_buffer_utils.cpp
@@ -68,7 +68,7 @@
uint64_t getClientUsage(const std::shared_ptr<C2BlockPool> &pool) {
std::shared_ptr<C2GraphicBlock> myOutBlock;
const C2MemoryUsage usage = {0, 0};
- const uint32_t format = HAL_PIXEL_FORMAT_YV12;
+ const uint32_t format = HAL_PIXEL_FORMAT_YCBCR_420_888;
pool->fetchGraphicBlock(2, 2, format, usage, &myOutBlock);
auto myc2Handle = myOutBlock->handle();
native_handle_t *mygrallocHandle =
diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
index 922b837..81c07a8 100644
--- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
+++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
@@ -669,7 +669,7 @@
mOutBlock.reset();
}
if (!mOutBlock) {
- const uint32_t format = HAL_PIXEL_FORMAT_YV12;
+ const uint32_t format = HAL_PIXEL_FORMAT_YCBCR_420_888;
const C2MemoryUsage usage = {(uint64_t)(BufferUsage::VIDEO_DECODER),
C2MemoryUsage::CPU_WRITE | C2MemoryUsage::CPU_READ};
c2_status_t err = pool->fetchGraphicBlock(ALIGN2(mWidth), mHeight,
diff --git a/system/codecs/c2/decoders/vpxdec/C2GoldfishVpxDec.cpp b/system/codecs/c2/decoders/vpxdec/C2GoldfishVpxDec.cpp
index 37c4a51..1d2a70e 100644
--- a/system/codecs/c2/decoders/vpxdec/C2GoldfishVpxDec.cpp
+++ b/system/codecs/c2/decoders/vpxdec/C2GoldfishVpxDec.cpp
@@ -852,24 +852,30 @@
}
}
-static void copyOutputBufferToYuvPlanarFrame(C2GraphicView& writeView, const uint8_t* srcY,
- const uint8_t* srcU, const uint8_t* srcV, uint32_t width, uint32_t height) {
+static void copyOutputBufferToYuvPlanarFrame(
+ uint8_t *dst, const uint8_t *srcY, const uint8_t *srcU, const uint8_t *srcV,
+ size_t srcYStride, size_t srcUStride, size_t srcVStride, size_t dstYStride,
+ size_t dstUVStride, uint32_t width, uint32_t height) {
+ uint8_t *dstStart = dst;
- size_t dstYStride = writeView.layout().planes[C2PlanarLayout::PLANE_Y].rowInc;
- size_t dstUVStride = writeView.layout().planes[C2PlanarLayout::PLANE_U].rowInc;
-
- uint8_t *pYBuffer = const_cast<uint8_t *>(writeView.data()[C2PlanarLayout::PLANE_Y]);
- uint8_t *pUBuffer = const_cast<uint8_t *>(writeView.data()[C2PlanarLayout::PLANE_U]);
- uint8_t *pVBuffer = const_cast<uint8_t *>(writeView.data()[C2PlanarLayout::PLANE_V]);
-
- for (int i = 0; i < height; ++i) {
- memcpy(pYBuffer + i * dstYStride, srcY + i * width, width);
+ for (size_t i = 0; i < height; ++i) {
+ memcpy(dst, srcY, width);
+ srcY += srcYStride;
+ dst += dstYStride;
}
- for (int i = 0; i < height / 2; ++i) {
- memcpy(pUBuffer + i * dstUVStride, srcU + i * width / 2, width / 2);
+
+ dst = dstStart + dstYStride * height;
+ for (size_t i = 0; i < height / 2; ++i) {
+ memcpy(dst, srcV, width / 2);
+ srcV += srcVStride;
+ dst += dstUVStride;
}
- for (int i = 0; i < height / 2; ++i) {
- memcpy(pVBuffer + i * dstUVStride, srcV + i * width / 2, width / 2);
+
+ dst = dstStart + (dstYStride * height) + (dstUVStride * height / 2);
+ for (size_t i = 0; i < height / 2; ++i) {
+ memcpy(dst, srcU, width / 2);
+ srcU += srcUStride;
+ dst += dstUVStride;
}
}
@@ -892,7 +898,7 @@
// now get the block
std::shared_ptr<C2GraphicBlock> block;
- uint32_t format = HAL_PIXEL_FORMAT_YV12;
+ uint32_t format = HAL_PIXEL_FORMAT_YCBCR_420_888;
const C2MemoryUsage usage = {(uint64_t)(BufferUsage::VIDEO_DECODER),
C2MemoryUsage::CPU_WRITE | C2MemoryUsage::CPU_READ};
@@ -1006,12 +1012,13 @@
if (img->fmt == VPX_IMG_FMT_I42016) {
ALOGW("WARNING: not I42016 is not supported !!!");
} else if (1) {
- // the decoded frame is YUV420 from host
const uint8_t *srcY = (const uint8_t *)mCtx->dst;
- const uint8_t *srcU = srcY + mWidth * mHeight;
- const uint8_t *srcV = srcU + mWidth * mHeight / 4;
+ const uint8_t *srcV = srcY + mWidth * mHeight;
+ const uint8_t *srcU = srcV + mWidth * mHeight / 4;
// TODO: the following crashes
- copyOutputBufferToYuvPlanarFrame(wView, srcY, srcU, srcV, mWidth, mHeight);
+ copyOutputBufferToYuvPlanarFrame(dst, srcY, srcU, srcV, srcYStride,
+ srcUStride, srcVStride, dstYStride,
+ dstUVStride, mWidth, mHeight);
// memcpy(dst, srcY, mWidth * mHeight / 2);
}
}
diff --git a/system/hwc3/ComposerClient.cpp b/system/hwc3/ComposerClient.cpp
index bc37e1d..2ae2499 100644
--- a/system/hwc3/ComposerClient.cpp
+++ b/system/hwc3/ComposerClient.cpp
@@ -791,6 +791,8 @@
PerFrameMetadata);
DISPATCH_LAYER_COMMAND(layerCommand, commandResults, display, layer, perFrameMetadataBlob,
PerFrameMetadataBlobs);
+ DISPATCH_LAYER_COMMAND(layerCommand, commandResults, display, layer, luts,
+ Luts);
}
void ComposerClient::executeDisplayCommandSetColorTransform(CommandResultWriter& commandResults,
@@ -1194,6 +1196,13 @@
}
}
+void ComposerClient::executeLayerCommandSetLayerLuts(CommandResultWriter& /*commandResults*/,
+ Display& /*display*/, Layer* /*layer*/,
+ const std::vector<std::optional<Lut>>& /*luts*/) {
+ DEBUG_LOG("%s", __FUNCTION__);
+ //TODO(b/358188835)
+}
+
std::shared_ptr<Display> ComposerClient::getDisplay(int64_t displayId) {
std::lock_guard<std::mutex> lock(mDisplaysMutex);
diff --git a/system/hwc3/ComposerClient.h b/system/hwc3/ComposerClient.h
index 2cf198f..3cf1068 100644
--- a/system/hwc3/ComposerClient.h
+++ b/system/hwc3/ComposerClient.h
@@ -18,6 +18,7 @@
#define ANDROID_HWC_COMPOSERCLIENT_H
#include <aidl/android/hardware/graphics/composer3/BnComposerClient.h>
+#include <aidl/android/hardware/graphics/composer3/Lut.h>
#include <android-base/thread_annotations.h>
#include <memory>
@@ -202,6 +203,9 @@
void executeLayerCommandSetLayerPerFrameMetadataBlobs(
CommandResultWriter& commandResults, Display& display, Layer* layer,
const std::vector<std::optional<PerFrameMetadataBlob>>& perFrameMetadataBlob);
+ void executeLayerCommandSetLayerLuts(
+ CommandResultWriter& commandResults, Display& display, Layer* layer,
+ const std::vector<std::optional<Lut>>& luts);
// Returns the display with the given id or nullptr if not found.
std::shared_ptr<Display> getDisplay(int64_t displayId);
diff --git a/system/hwc3/hwc3.xml b/system/hwc3/hwc3.xml
index 7f0d8b7..4c4fb95 100644
--- a/system/hwc3/hwc3.xml
+++ b/system/hwc3/hwc3.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
- <version>3</version>
+ <version>4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
