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

Commit 0b7fcbdd authored by Daniel Chapin's avatar Daniel Chapin Committed by android-build-team Robot
Browse files

Revert "Pass in format when creating and updating BBQ." 

Revert submission 13348893-blast_format

Reason for revert: Bug: 178062437
Reverted Changes:
I26806cfd4:Remove preserve surfaces when surface format chang...
Ib9137eb83:Pass in format when creating and updating BBQ.

Change-Id: I7df4f11002071555c106f3259d0604ad92b6487c
(cherry picked from commit 1ca890fb82791652676e294de2854bdc39d867b9)
parent 2250fc55

libs/gui/BLASTBufferQueue.cpp

+3 −11
Original line number Original line Diff line number Diff line
@@ -117,13 +117,11 @@ void BLASTBufferItemConsumer::getConnectionEvents(uint64_t frameNumber, bool* ne 
}

}





BLASTBufferQueue::BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface,

BLASTBufferQueue::BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface,

                                   int width, int height, int32_t format,

                                   int width, int height, bool enableTripleBuffering)

                                   bool enableTripleBuffering)

      : mName(name),

      : mName(name),

        mSurfaceControl(surface),

        mSurfaceControl(surface),

        mSize(width, height),

        mSize(width, height),

        mRequestedSize(mSize),

        mRequestedSize(mSize),

        mFormat(format),

        mNextTransaction(nullptr) {

        mNextTransaction(nullptr) {

    createBufferQueue(&mProducer, &mConsumer);

    createBufferQueue(&mProducer, &mConsumer);

    // since the adapter is in the client process, set dequeue timeout

    // since the adapter is in the client process, set dequeue timeout
@@ -142,7 +140,7 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, const sp<SurfaceCont 
    mBufferItemConsumer->setFrameAvailableListener(this);

    mBufferItemConsumer->setFrameAvailableListener(this);

    mBufferItemConsumer->setBufferFreedListener(this);

    mBufferItemConsumer->setBufferFreedListener(this);

    mBufferItemConsumer->setDefaultBufferSize(mSize.width, mSize.height);

    mBufferItemConsumer->setDefaultBufferSize(mSize.width, mSize.height);

    mBufferItemConsumer->setDefaultBufferFormat(format);

    mBufferItemConsumer->setDefaultBufferFormat(PIXEL_FORMAT_RGBA_8888);





    mTransformHint = mSurfaceControl->getTransformHint();

    mTransformHint = mSurfaceControl->getTransformHint();

    mBufferItemConsumer->setTransformHint(mTransformHint);

    mBufferItemConsumer->setTransformHint(mTransformHint);
@@ -166,16 +164,10 @@ BLASTBufferQueue::~BLASTBufferQueue() { 
    t.apply();

    t.apply();

}

}





void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, uint32_t width, uint32_t height,

void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, uint32_t width, uint32_t height) {

                              int32_t format) {

    std::unique_lock _lock{mMutex};

    std::unique_lock _lock{mMutex};

    mSurfaceControl = surface;

    mSurfaceControl = surface;





    if (mFormat != format) {

        mFormat = format;

        mBufferItemConsumer->setDefaultBufferFormat(format);

    }



    ui::Size newSize(width, height);

    ui::Size newSize(width, height);

    if (mRequestedSize != newSize) {

    if (mRequestedSize != newSize) {

        mRequestedSize.set(newSize);

        mRequestedSize.set(newSize);

libs/gui/include/gui/BLASTBufferQueue.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ class BLASTBufferQueue 
{

{

public:

public:

    BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface, int width,

    BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface, int width,

                     int height, int32_t format, bool enableTripleBuffering = true);

                     int height, bool enableTripleBuffering = true);





    sp<IGraphicBufferProducer> getIGraphicBufferProducer() const {

    sp<IGraphicBufferProducer> getIGraphicBufferProducer() const {

        return mProducer;

        return mProducer;
@@ -88,7 +88,7 @@ public: 
    void setTransactionCompleteCallback(uint64_t frameNumber,

    void setTransactionCompleteCallback(uint64_t frameNumber,

                                        std::function<void(int64_t)>&& transactionCompleteCallback);

                                        std::function<void(int64_t)>&& transactionCompleteCallback);





    void update(const sp<SurfaceControl>& surface, uint32_t width, uint32_t height, int32_t format);

    void update(const sp<SurfaceControl>& surface, uint32_t width, uint32_t height);

    void flushShadowQueue() { mFlushShadowQueue = true; }

    void flushShadowQueue() { mFlushShadowQueue = true; }





    status_t setFrameRate(float frameRate, int8_t compatibility, bool shouldBeSeamless);

    status_t setFrameRate(float frameRate, int8_t compatibility, bool shouldBeSeamless);
@@ -136,7 +136,6 @@ private: 




    ui::Size mSize GUARDED_BY(mMutex);

    ui::Size mSize GUARDED_BY(mMutex);

    ui::Size mRequestedSize GUARDED_BY(mMutex);

    ui::Size mRequestedSize GUARDED_BY(mMutex);

    int32_t mFormat GUARDED_BY(mMutex);





    uint32_t mTransformHint GUARDED_BY(mMutex);

    uint32_t mTransformHint GUARDED_BY(mMutex);

libs/gui/tests/BLASTBufferQueue_test.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -45,12 +45,11 @@ using android::hardware::graphics::common::V1_2::BufferUsage; 
class BLASTBufferQueueHelper {

class BLASTBufferQueueHelper {

public:

public:

    BLASTBufferQueueHelper(const sp<SurfaceControl>& sc, int width, int height) {

    BLASTBufferQueueHelper(const sp<SurfaceControl>& sc, int width, int height) {

        mBlastBufferQueueAdapter = new BLASTBufferQueue("TestBLASTBufferQueue", sc, width, height,

        mBlastBufferQueueAdapter = new BLASTBufferQueue("TestBLASTBufferQueue", sc, width, height);

                                                        PIXEL_FORMAT_RGBA_8888);

    }

    }





    void update(const sp<SurfaceControl>& sc, int width, int height) {

    void update(const sp<SurfaceControl>& sc, int width, int height) {

        mBlastBufferQueueAdapter->update(sc, width, height, PIXEL_FORMAT_RGBA_8888);

        mBlastBufferQueueAdapter->update(sc, width, height);

    }

    }





    void setNextTransaction(Transaction* next) {

    void setNextTransaction(Transaction* next) {