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

Commit 9395fce7 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Update hostgraphics API of BufferQueue/BufferItemConsumer" into main

parents 46b5a7db 4c8baf6f

libs/hostgraphics/HostBufferQueue.cpp

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ private: 
};



void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

                                    sp<IGraphicBufferConsumer>* outConsumer) {

                                    sp<IGraphicBufferConsumer>* outConsumer,

                                    bool consumerIsSurfaceFlinger) {

    sp<HostBufferQueue> obj(new HostBufferQueue());



    *outProducer = obj;

libs/hostgraphics/include/gui/BufferItemConsumer.h

+1 −1
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ public: 
        BufferQueue::createBufferQueue(&producer, &mConsumer);

        mSurface = sp<Surface>::make(producer, controlledByApp);

    }

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)



    status_t setConsumerIsProtected(bool isProtected) {

        return OK;

    }

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)



    status_t acquireBuffer(BufferItem* item, nsecs_t presentWhen, bool waitForFence = true) {

        return mConsumer->acquireBuffer(item, presentWhen, 0);

libs/hostgraphics/include/gui/BufferQueue.h

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ public: 
    enum { NO_BUFFER_AVAILABLE = IGraphicBufferConsumer::NO_BUFFER_AVAILABLE };



    static void createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

                                  sp<IGraphicBufferConsumer>* outConsumer);

                                  sp<IGraphicBufferConsumer>* outConsumer,

                                  bool consumerIsSurfaceFlinger = false);

};



} // namespace android