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

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

Merge "SF builds with ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION"

parents aa5c53f6 6fc73303

media/libstagefright/renderfright/tests/RenderEngineTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct RenderEngineTest : public ::testing::Test { 
    }



    static sp<GraphicBuffer> allocateDefaultBuffer() {

        return new GraphicBuffer(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT,

        return sp<GraphicBuffer>::make(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT,

                                 HAL_PIXEL_FORMAT_RGBA_8888, 1,

                                 GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN |

                                         GRALLOC_USAGE_HW_RENDER,
@@ -69,7 +69,7 @@ struct RenderEngineTest : public ::testing::Test { 


    // Allocates a 1x1 buffer to fill with a solid color

    static sp<GraphicBuffer> allocateSourceBuffer(uint32_t width, uint32_t height) {

        return new GraphicBuffer(width, height, HAL_PIXEL_FORMAT_RGBA_8888, 1,

        return sp<GraphicBuffer>::make(width, height, HAL_PIXEL_FORMAT_RGBA_8888, 1,

                                 GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN |

                                         GRALLOC_USAGE_HW_TEXTURE,

                                 "input");
@@ -275,7 +275,7 @@ struct RenderEngineTest : public ::testing::Test { 
        renderengine::DisplaySettings settings;

        std::vector<const renderengine::LayerSettings*> layers;

        // Meaningless buffer since we don't do any drawing

        sp<GraphicBuffer> buffer = new GraphicBuffer();

        sp<GraphicBuffer> buffer = sp<GraphicBuffer>::make();

        invokeDraw(settings, layers, buffer);

    }

media/libstagefright/renderfright/tests/RenderEngineThreadedTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ TEST_F(RenderEngineThreadedTest, bindExternalBuffer_nullptrBuffer) { 
}



TEST_F(RenderEngineThreadedTest, bindExternalBuffer_withBuffer) {

    sp<GraphicBuffer> buf = new GraphicBuffer();

    sp<GraphicBuffer> buf = sp<GraphicBuffer>::make();

    EXPECT_CALL(*mRenderEngine, bindExternalTextureBuffer(0, buf, Eq(nullptr)))

            .WillOnce(Return(NO_ERROR));

    status_t result = mThreadedRE->bindExternalTextureBuffer(0, buf, nullptr);
@@ -83,7 +83,7 @@ TEST_F(RenderEngineThreadedTest, cacheExternalTextureBuffer_nullptr) { 
}



TEST_F(RenderEngineThreadedTest, cacheExternalTextureBuffer_withBuffer) {

    sp<GraphicBuffer> buf = new GraphicBuffer();

    sp<GraphicBuffer> buf = sp<GraphicBuffer>::make();

    EXPECT_CALL(*mRenderEngine, cacheExternalTextureBuffer(buf));

    mThreadedRE->cacheExternalTextureBuffer(buf);

}
@@ -198,7 +198,7 @@ TEST_F(RenderEngineThreadedTest, cleanupPostRender_returnsTrue) { 
TEST_F(RenderEngineThreadedTest, drawLayers) {

    renderengine::DisplaySettings settings;

    std::vector<const renderengine::LayerSettings*> layers;

    sp<GraphicBuffer> buffer = new GraphicBuffer();

    sp<GraphicBuffer> buffer = sp<GraphicBuffer>::make();

    base::unique_fd bufferFence;

    base::unique_fd drawFence;