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

Commit 778360bc authored by Jim Shargo's avatar Jim Shargo Committed by Android (Google) Code Review
Browse files

Merge changes I51100792,I7592bec0 into main 

* changes:
  nativewindow: ConsumerBase-based classes now create their own BufferQueues
  nativedisplay: ConsumerBase-based classes now create their own BufferQueues
parents 0d9430de e1bf47dd

libs/nativedisplay/include/surfacetexture/SurfaceTexture.h

+16 −0
Original line number Diff line number Diff line
@@ -98,11 +98,25 @@ public: 
     * is created in a detached state, and attachToContext must be called before

     * calls to updateTexImage.

     */

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    SurfaceTexture(uint32_t tex, uint32_t textureTarget, bool useFenceSync, bool isControlledByApp);



    SurfaceTexture(uint32_t textureTarget, bool useFenceSync, bool isControlledByApp);



    SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t tex, uint32_t textureTarget,

                   bool useFenceSync, bool isControlledByApp)

            __attribute((deprecated("Prefer ctors that create their own surface and consumer.")));



    SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t textureTarget, bool useFenceSync,

                   bool isControlledByApp)

            __attribute((deprecated("Prefer ctors that create their own surface and consumer.")));

#else

    SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t tex, uint32_t textureTarget,

                   bool useFenceSync, bool isControlledByApp);



    SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t textureTarget, bool useFenceSync,

                   bool isControlledByApp);

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)



    /**

     * updateTexImage acquires the most recently queued buffer, and sets the
@@ -499,6 +513,8 @@ protected: 
    friend class EGLConsumer;



private:

    void initialize();



    // Proxy listener to avoid having SurfaceTexture directly implement FrameAvailableListener as it

    // is extending ConsumerBase which also implements FrameAvailableListener.

    class FrameAvailableListenerProxy : public ConsumerBase::FrameAvailableListener {

libs/nativedisplay/surfacetexture/SurfaceTexture.cpp

+53 −10
Original line number Diff line number Diff line
@@ -35,6 +35,49 @@ namespace android { 


static const mat4 mtxIdentity;



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

SurfaceTexture::SurfaceTexture(uint32_t tex, uint32_t texTarget, bool useFenceSync,

                               bool isControlledByApp)

      : ConsumerBase(isControlledByApp),

        mCurrentCrop(Rect::EMPTY_RECT),

        mCurrentTransform(0),

        mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

        mCurrentFence(Fence::NO_FENCE),

        mCurrentTimestamp(0),

        mCurrentDataSpace(HAL_DATASPACE_UNKNOWN),

        mCurrentFrameNumber(0),

        mDefaultWidth(1),

        mDefaultHeight(1),

        mFilteringEnabled(true),

        mTexName(tex),

        mUseFenceSync(useFenceSync),

        mTexTarget(texTarget),

        mCurrentTexture(BufferQueue::INVALID_BUFFER_SLOT),

        mOpMode(OpMode::attachedToGL) {

    initialize();

}



SurfaceTexture::SurfaceTexture(uint32_t texTarget, bool useFenceSync, bool isControlledByApp)

      : ConsumerBase(isControlledByApp),

        mCurrentCrop(Rect::EMPTY_RECT),

        mCurrentTransform(0),

        mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

        mCurrentFence(Fence::NO_FENCE),

        mCurrentTimestamp(0),

        mCurrentDataSpace(HAL_DATASPACE_UNKNOWN),

        mCurrentFrameNumber(0),

        mDefaultWidth(1),

        mDefaultHeight(1),

        mFilteringEnabled(true),

        mTexName(0),

        mUseFenceSync(useFenceSync),

        mTexTarget(texTarget),

        mCurrentTexture(BufferQueue::INVALID_BUFFER_SLOT),

        mOpMode(OpMode::detached) {

    initialize();

}

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)



SurfaceTexture::SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t tex,

                               uint32_t texTarget, bool useFenceSync, bool isControlledByApp)

      : ConsumerBase(bq, isControlledByApp),
@@ -53,11 +96,7 @@ SurfaceTexture::SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t te 
        mTexTarget(texTarget),

        mCurrentTexture(BufferQueue::INVALID_BUFFER_SLOT),

        mOpMode(OpMode::attachedToGL) {

    SFT_LOGV("SurfaceTexture");



    memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(), sizeof(mCurrentTransformMatrix));



    mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);

    initialize();

}



SurfaceTexture::SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t texTarget,
@@ -78,11 +117,7 @@ SurfaceTexture::SurfaceTexture(const sp<IGraphicBufferConsumer>& bq, uint32_t te 
        mTexTarget(texTarget),

        mCurrentTexture(BufferQueue::INVALID_BUFFER_SLOT),

        mOpMode(OpMode::detached) {

    SFT_LOGV("SurfaceTexture");



    memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(), sizeof(mCurrentTransformMatrix));



    mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);

    initialize();

}



status_t SurfaceTexture::setDefaultBufferSize(uint32_t w, uint32_t h) {
@@ -531,4 +566,12 @@ void SurfaceTexture::onSetFrameRate(float frameRate, int8_t compatibility, 
}

#endif



void SurfaceTexture::initialize() {

    SFT_LOGV("SurfaceTexture");



    memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(), sizeof(mCurrentTransformMatrix));



    mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);

}



} // namespace android

libs/nativewindow/tests/ANativeWindowTest.cpp

+8 −1
Original line number Diff line number Diff line
@@ -50,9 +50,14 @@ protected: 
        const ::testing::TestInfo* const test_info =

                ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGV("**** Setting up for %s.%s\n", test_info->test_case_name(), test_info->name());

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

        mItemConsumer = new BufferItemConsumer(GRALLOC_USAGE_SW_READ_OFTEN);

        mWindow = new TestableSurface(mItemConsumer->getSurface()->getIGraphicBufferProducer());

#else

        BufferQueue::createBufferQueue(&mProducer, &mConsumer);

        mItemConsumer = new BufferItemConsumer(mConsumer, GRALLOC_USAGE_SW_READ_OFTEN);

        mWindow = new TestableSurface(mProducer);

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

        const int success = native_window_api_connect(mWindow.get(), NATIVE_WINDOW_API_CPU);

        EXPECT_EQ(0, success);

    }
@@ -64,10 +69,12 @@ protected: 
        const int success = native_window_api_disconnect(mWindow.get(), NATIVE_WINDOW_API_CPU);

        EXPECT_EQ(0, success);

    }



#if !COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<IGraphicBufferProducer> mProducer;

    sp<IGraphicBufferConsumer> mConsumer;

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<BufferItemConsumer> mItemConsumer;



    sp<TestableSurface> mWindow;

};