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

Commit 0b93288c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "gralloc: name buffer at allocation time"

parents d9ea7189 bf9f6d39

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+5 −2
Original line number Diff line number Diff line
@@ -6320,9 +6320,10 @@ void CameraHidlTest::allocateGraphicBuffer(uint32_t width, uint32_t height, uint 
        android::hardware::graphics::mapper::V3_0::IMapper::getService();

    sp<android::hardware::graphics::mapper::V2_0::IMapper> mapper =

        android::hardware::graphics::mapper::V2_0::IMapper::getService();

    ::android::hardware::hidl_vec<uint32_t> descriptor;

    if (mapperV4 != nullptr && allocatorV4 != nullptr) {

        ::android::hardware::hidl_vec<uint8_t> descriptor;

        android::hardware::graphics::mapper::V4_0::IMapper::BufferDescriptorInfo descriptorInfo{};

        descriptorInfo.name = "VtsHalCameraProviderV2_4";

        descriptorInfo.width = width;

        descriptorInfo.height = height;

        descriptorInfo.layerCount = 1;
@@ -6332,7 +6333,7 @@ void CameraHidlTest::allocateGraphicBuffer(uint32_t width, uint32_t height, uint 


        auto ret = mapperV4->createDescriptor(

                descriptorInfo, [&descriptor](android::hardware::graphics::mapper::V4_0::Error err,

                                              ::android::hardware::hidl_vec<uint32_t> desc) {

                                              ::android::hardware::hidl_vec<uint8_t> desc) {

                    ASSERT_EQ(err, android::hardware::graphics::mapper::V4_0::Error::NONE);

                    descriptor = desc;

                });
@@ -6349,6 +6350,7 @@ void CameraHidlTest::allocateGraphicBuffer(uint32_t width, uint32_t height, uint 
                });

        ASSERT_TRUE(ret.isOk());

    } else if (mapperV3 != nullptr && allocatorV3 != nullptr) {

        ::android::hardware::hidl_vec<uint32_t> descriptor;

        android::hardware::graphics::mapper::V3_0::IMapper::BufferDescriptorInfo descriptorInfo {};

        descriptorInfo.width = width;

        descriptorInfo.height = height;
@@ -6374,6 +6376,7 @@ void CameraHidlTest::allocateGraphicBuffer(uint32_t width, uint32_t height, uint 
            });

        ASSERT_TRUE(ret.isOk());

    } else {

        ::android::hardware::hidl_vec<uint32_t> descriptor;

        ASSERT_NE(mapper.get(), nullptr);

        ASSERT_NE(allocator.get(), nullptr);

        android::hardware::graphics::mapper::V2_0::IMapper::BufferDescriptorInfo descriptorInfo {};

graphics/mapper/4.0/IMapper.hal

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ import android.hardware.graphics.common@1.2::Rect; 


interface IMapper {

    struct BufferDescriptorInfo {

        /**

         * The name of the buffer. Useful for debugging/tracing.

         */

        string name;



        /**

         * The width specifies how many columns of pixels must be in the

         * allocated buffer, but does not necessarily represent the offset in

graphics/mapper/4.0/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ enum Error : int32_t { 
 * createDescriptor(). It describes the properties of a buffer and is consumed

 * by the allocator.

 */

typedef vec<uint32_t> BufferDescriptor;

typedef vec<uint8_t> BufferDescriptor;



/**

 * Structure for describing YCbCr formats for consumption by applications.

graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ class GraphicsMapperHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
                        GraphicsMapperHidlEnvironment::Instance()->getServiceName<IAllocator>(),

                        GraphicsMapperHidlEnvironment::Instance()->getServiceName<IMapper>()));



        mDummyDescriptorInfo.name = "dummy";

        mDummyDescriptorInfo.width = 64;

        mDummyDescriptorInfo.height = 64;

        mDummyDescriptorInfo.layerCount = 1;