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

Commit 070d2191 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gralloc4-vts: Allow getFromBufferDescriptorInfo return unsupported"... 

Merge "gralloc4-vts: Allow getFromBufferDescriptorInfo return unsupported" into rvc-dev am: 5f0ce205

Change-Id: I2482480a224bf2f1dce56f3c72452e7228b0a1ef
parents 333d6c54 5f0ce205

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

+70 −22
Original line number Diff line number Diff line
@@ -1927,8 +1927,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoProtectedContent) { 
    info.usage = BufferUsage::PROTECTED | BufferUsage::COMPOSER_OVERLAY;



    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   info, gralloc4::MetadataType_ProtectedContent, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(info, gralloc4::MetadataType_ProtectedContent,

                                                     &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    uint64_t protectedContent = 0;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeProtectedContent(vec, &protectedContent));
@@ -1943,8 +1948,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCompression) { 
    info.usage = static_cast<uint64_t>(BufferUsage::CPU_WRITE_OFTEN | BufferUsage::CPU_READ_OFTEN);



    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   info, gralloc4::MetadataType_Compression, &vec));

    auto err =

            mGralloc->getFromBufferDescriptorInfo(info, gralloc4::MetadataType_Compression, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    ExtendableType compression = gralloc4::Compression_DisplayStreamCompression;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeCompression(vec, &compression));
@@ -1958,8 +1968,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCompression) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoInterlaced) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   mDummyDescriptorInfo, gralloc4::MetadataType_Interlaced, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_Interlaced, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    ExtendableType interlaced = gralloc4::Interlaced_TopBottom;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeInterlaced(vec, &interlaced));
@@ -1973,9 +1988,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoInterlaced) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoChromaSiting) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE,

              mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                    gralloc4::MetadataType_ChromaSiting, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_ChromaSiting, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    ExtendableType chromaSiting = gralloc4::ChromaSiting_CositedHorizontal;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeChromaSiting(vec, &chromaSiting));
@@ -2009,8 +2028,12 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCrop) { 
    info.usage = static_cast<uint64_t>(BufferUsage::CPU_WRITE_OFTEN | BufferUsage::CPU_READ_OFTEN);



    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE,

              mGralloc->getFromBufferDescriptorInfo(info, gralloc4::MetadataType_Crop, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(info, gralloc4::MetadataType_Crop, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    std::vector<aidl::android::hardware::graphics::common::Rect> crops;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeCrop(vec, &crops));
@@ -2022,8 +2045,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCrop) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoDataspace) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   mDummyDescriptorInfo, gralloc4::MetadataType_Dataspace, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_Dataspace, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    Dataspace dataspace = Dataspace::DISPLAY_P3;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeDataspace(vec, &dataspace));
@@ -2035,8 +2063,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoDataspace) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoBlendMode) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   mDummyDescriptorInfo, gralloc4::MetadataType_BlendMode, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_BlendMode, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    BlendMode blendMode = BlendMode::COVERAGE;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeBlendMode(vec, &blendMode));
@@ -2048,8 +2081,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoBlendMode) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoSmpte2086) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   mDummyDescriptorInfo, gralloc4::MetadataType_Smpte2086, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_Smpte2086, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    std::optional<Smpte2086> smpte2086;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeSmpte2086(vec, &smpte2086));
@@ -2061,8 +2099,13 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoSmpte2086) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCta861_3) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->getFromBufferDescriptorInfo(

                                   mDummyDescriptorInfo, gralloc4::MetadataType_Cta861_3, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_Cta861_3, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    std::optional<Cta861_3> cta861_3;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeCta861_3(vec, &cta861_3));
@@ -2074,9 +2117,14 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoCta861_3) { 
 */

TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoSmpte2094_40) {

    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE,

              mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                    gralloc4::MetadataType_Smpte2094_40, &vec));

    auto err = mGralloc->getFromBufferDescriptorInfo(mDummyDescriptorInfo,

                                                     gralloc4::MetadataType_Smpte2094_40, &vec);

    if (err == Error::UNSUPPORTED) {

        GTEST_SUCCEED() << "setting this metadata is unsupported";

        return;

    }

    ASSERT_EQ(err, Error::NONE);



    std::optional<std::vector<uint8_t>> smpte2094_40;

    ASSERT_EQ(NO_ERROR, gralloc4::decodeSmpte2094_40(vec, &smpte2094_40));

    EXPECT_FALSE(smpte2094_40.has_value());