Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae7201b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libui: Add dataspace info into Gralloc4Mapper::bufferDumpHelper" into... 

Merge "libui: Add dataspace info into Gralloc4Mapper::bufferDumpHelper" into sc-dev am: 82fb77a8 am: 73188409

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14352644

Change-Id: Ib6fca6b776d1b7d4e695eaeac50cebcccb0dd01c
parents 0699756b 73188409

libs/ui/Gralloc4.cpp

+9 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ using android::hardware::graphics::common::V1_2::BufferUsage; 
using android::hardware::graphics::mapper::V4_0::BufferDescriptor;

using android::hardware::graphics::mapper::V4_0::Error;

using android::hardware::graphics::mapper::V4_0::IMapper;

using AidlDataspace = ::aidl::android::hardware::graphics::common::Dataspace;

using BufferDump = android::hardware::graphics::mapper::V4_0::IMapper::BufferDump;

using MetadataDump = android::hardware::graphics::mapper::V4_0::IMapper::MetadataDump;

using MetadataType = android::hardware::graphics::mapper::V4_0::IMapper::MetadataType;
@@ -597,7 +598,7 @@ status_t Gralloc4Mapper::getDataspace(buffer_handle_t bufferHandle, 
    if (!outDataspace) {

        return BAD_VALUE;

    }

    aidl::android::hardware::graphics::common::Dataspace dataspace;

    AidlDataspace dataspace;

    status_t error = get(bufferHandle, gralloc4::MetadataType_Dataspace, gralloc4::decodeDataspace,

                         &dataspace);

    if (error) {
@@ -841,6 +842,7 @@ status_t Gralloc4Mapper::bufferDumpHelper(const BufferDump& bufferDump, std::ost 
    uint32_t pixelFormatFourCC;

    uint64_t pixelFormatModifier;

    uint64_t usage;

    AidlDataspace dataspace;

    uint64_t allocationSize;

    uint64_t protectedContent;

    ExtendableType compression;
@@ -892,6 +894,11 @@ status_t Gralloc4Mapper::bufferDumpHelper(const BufferDump& bufferDump, std::ost 
    if (error != NO_ERROR) {

        return error;

    }

    error = metadataDumpHelper(bufferDump, StandardMetadataType::DATASPACE,

                               gralloc4::decodeDataspace, &dataspace);

    if (error != NO_ERROR) {

        return error;

    }

    error = metadataDumpHelper(bufferDump, StandardMetadataType::ALLOCATION_SIZE,

                               gralloc4::decodeAllocationSize, &allocationSize);

    if (error != NO_ERROR) {
@@ -932,6 +939,7 @@ status_t Gralloc4Mapper::bufferDumpHelper(const BufferDump& bufferDump, std::ost 
             << "KiB, w/h:" << width << "x" << height << ", usage: 0x" << std::hex << usage

             << std::dec << ", req fmt:" << static_cast<int32_t>(pixelFormatRequested)

             << ", fourcc/mod:" << pixelFormatFourCC << "/" << pixelFormatModifier

             << ", dataspace: 0x" << std::hex << static_cast<uint32_t>(dataspace)

             << ", compressed: ";



    if (less) {