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

Commit b72b5c9e authored by Marissa Wall's avatar Marissa Wall
Browse files

test-hwc2: set layer dataspace 

Test: Add "#define HAVE_NO_SURFACE_FLINGER" to
          frameworks/native/libs/gui/BufferQueueCore.cpp.
      Recompile and flash.
      Run "mm" in frameworks/native/services/surfaceflinger/tests/hwc2.
      Push test-hwc2 to device.
      Run "adb root && adb shell stop".
      Run test case. Ex: "./test-hwc2"

Change-Id: Ia5bc9e53815d519e2016f3db12d69c6cc70a9b26
parent ffc67daf

services/surfaceflinger/tests/hwc2/Hwc2Test.cpp

+49 −0
Original line number Diff line number Diff line
@@ -374,6 +374,22 @@ public: 
        }

    }



    void setLayerDataspace(hwc2_display_t display, hwc2_layer_t layer,

            android_dataspace_t dataspace, hwc2_error_t* outErr = nullptr)

    {

        auto pfn = reinterpret_cast<HWC2_PFN_SET_LAYER_DATASPACE>(

                getFunction(HWC2_FUNCTION_SET_LAYER_DATASPACE));

        ASSERT_TRUE(pfn) << "failed to get function";



        auto err = static_cast<hwc2_error_t>(pfn(mHwc2Device, display,

                layer, dataspace));

        if (outErr) {

            *outErr = err;

        } else {

            ASSERT_EQ(err, HWC2_ERROR_NONE) << "failed to set layer dataspace";

        }

    }



protected:

    hwc2_function_pointer_t getFunction(hwc2_function_descriptor_t descriptor)

    {
@@ -728,6 +744,13 @@ void setComposition(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer, 
    }

}



void setDataspace(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer,

        const Hwc2TestLayer& testLayer, hwc2_error_t* outErr)

{

    EXPECT_NO_FATAL_FAILURE(test->setLayerDataspace(display, layer,

            testLayer.getDataspace(), outErr));

}



bool advanceBlendMode(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceBlendMode();
@@ -738,6 +761,11 @@ bool advanceComposition(Hwc2TestLayer* testLayer) 
    return testLayer->advanceComposition();

}



bool advanceDataspace(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceDataspace();

}





static const std::array<hwc2_function_descriptor_t, 42> requiredFunctions = {{

    HWC2_FUNCTION_ACCEPT_DISPLAY_CHANGES,
@@ -1619,3 +1647,24 @@ TEST_F(Hwc2Test, SET_LAYER_BLEND_MODE_bad_parameter) 
            }

    ));

}



/* TESTCASE: Tests that the HWC2 can set the dataspace of a layer. */

TEST_F(Hwc2Test, SET_LAYER_DATASPACE)

{

    ASSERT_NO_FATAL_FAILURE(setLayerProperty(Hwc2TestCoverage::Complete,

            setDataspace, advanceDataspace));

}



/* TESTCASE: Tests that the HWC2 can update the dataspace of a layer. */

TEST_F(Hwc2Test, SET_LAYER_DATASPACE_update)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyUpdate(Hwc2TestCoverage::Complete,

            setDataspace, advanceDataspace));

}



/* TESTCASE: Tests that the HWC2 cannot set a dataspace for a bad layer. */

TEST_F(Hwc2Test, SET_LAYER_DATASPACE_bad_layer)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyBadLayer(Hwc2TestCoverage::Default,

            setDataspace));

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp

+12 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 


Hwc2TestLayer::Hwc2TestLayer(Hwc2TestCoverage coverage)

    : mBlendMode(coverage),

      mComposition(coverage) { }

      mComposition(coverage),

      mDataspace(coverage) { }



std::string Hwc2TestLayer::dump() const

{
@@ -52,6 +53,11 @@ hwc2_composition_t Hwc2TestLayer::getComposition() const 
    return mComposition.get();

}



android_dataspace_t Hwc2TestLayer::getDataspace() const

{

    return mDataspace.get();

}



bool Hwc2TestLayer::advanceBlendMode()

{

    return mBlendMode.advance();
@@ -61,3 +67,8 @@ bool Hwc2TestLayer::advanceComposition() 
{

    return mComposition.advance();

}



bool Hwc2TestLayer::advanceDataspace()

{

    return mDataspace.advance();

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

+7 −4
Original line number Diff line number Diff line
@@ -35,17 +35,20 @@ public: 


    hwc2_blend_mode_t      getBlendMode() const;

    hwc2_composition_t     getComposition() const;

    android_dataspace_t    getDataspace() const;



    bool advanceBlendMode();

    bool advanceComposition();

    bool advanceDataspace();



private:

    std::array<Hwc2TestContainer*, 2> mProperties = {{

        &mBlendMode, &mComposition

    std::array<Hwc2TestContainer*, 3> mProperties = {{

        &mBlendMode, &mComposition, &mDataspace

    }};



    Hwc2TestBlendMode mBlendMode;

    Hwc2TestComposition mComposition;

    Hwc2TestDataspace mDataspace;

};



#endif /* ifndef _HWC2_TEST_LAYER_H */

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp

+66 −0
Original line number Diff line number Diff line
@@ -72,3 +72,69 @@ const std::vector<hwc2_composition_t> Hwc2TestComposition::mCompleteCompositions 
    HWC2_COMPOSITION_CURSOR,

    HWC2_COMPOSITION_SIDEBAND,

};





Hwc2TestDataspace::Hwc2TestDataspace(Hwc2TestCoverage coverage)

    : Hwc2TestProperty(coverage, completeDataspaces, basicDataspaces,

            defaultDataspaces) { }



std::string Hwc2TestDataspace::dump() const

{

    std::stringstream dmp;

    dmp << "\tdataspace: " << get() << "\n";

    return dmp.str();

}



const std::vector<android_dataspace_t> Hwc2TestDataspace::defaultDataspaces = {

    HAL_DATASPACE_UNKNOWN,

};



const std::vector<android_dataspace_t> Hwc2TestDataspace::basicDataspaces = {

    HAL_DATASPACE_UNKNOWN,

    HAL_DATASPACE_V0_SRGB,

};



const std::vector<android_dataspace_t> Hwc2TestDataspace::completeDataspaces = {

    HAL_DATASPACE_UNKNOWN,

    HAL_DATASPACE_ARBITRARY,

    HAL_DATASPACE_STANDARD_SHIFT,

    HAL_DATASPACE_STANDARD_MASK,

    HAL_DATASPACE_STANDARD_UNSPECIFIED,

    HAL_DATASPACE_STANDARD_BT709,

    HAL_DATASPACE_STANDARD_BT601_625,

    HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED,

    HAL_DATASPACE_STANDARD_BT601_525,

    HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED,

    HAL_DATASPACE_STANDARD_BT2020,

    HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE,

    HAL_DATASPACE_STANDARD_BT470M,

    HAL_DATASPACE_STANDARD_FILM,

    HAL_DATASPACE_TRANSFER_SHIFT,

    HAL_DATASPACE_TRANSFER_MASK,

    HAL_DATASPACE_TRANSFER_UNSPECIFIED,

    HAL_DATASPACE_TRANSFER_LINEAR,

    HAL_DATASPACE_TRANSFER_SRGB,

    HAL_DATASPACE_TRANSFER_SMPTE_170M,

    HAL_DATASPACE_TRANSFER_GAMMA2_2,

    HAL_DATASPACE_TRANSFER_GAMMA2_8,

    HAL_DATASPACE_TRANSFER_ST2084,

    HAL_DATASPACE_TRANSFER_HLG,

    HAL_DATASPACE_RANGE_SHIFT,

    HAL_DATASPACE_RANGE_MASK,

    HAL_DATASPACE_RANGE_UNSPECIFIED,

    HAL_DATASPACE_RANGE_FULL,

    HAL_DATASPACE_RANGE_LIMITED,

    HAL_DATASPACE_SRGB_LINEAR,

    HAL_DATASPACE_V0_SRGB_LINEAR,

    HAL_DATASPACE_SRGB,

    HAL_DATASPACE_V0_SRGB,

    HAL_DATASPACE_JFIF,

    HAL_DATASPACE_V0_JFIF,

    HAL_DATASPACE_BT601_625,

    HAL_DATASPACE_V0_BT601_625,

    HAL_DATASPACE_BT601_525,

    HAL_DATASPACE_V0_BT601_525,

    HAL_DATASPACE_BT709,

    HAL_DATASPACE_V0_BT709,

    HAL_DATASPACE_DEPTH,

};

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h

+13 −0
Original line number Diff line number Diff line
@@ -111,4 +111,17 @@ protected: 
    static const std::vector<hwc2_composition_t> mCompleteCompositions;

};





class Hwc2TestDataspace : public Hwc2TestProperty<android_dataspace_t> {

public:

    Hwc2TestDataspace(Hwc2TestCoverage coverage);



    std::string dump() const override;



protected:

    static const std::vector<android_dataspace_t> defaultDataspaces;

    static const std::vector<android_dataspace_t> basicDataspaces;

    static const std::vector<android_dataspace_t> completeDataspaces;

};



#endif /* ifndef _HWC2_TEST_PROPERTIES_H */