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

Commit a81bc497 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

libgui: add more IGBC wrappers to ConsumerBase 

Add

  ConsumerBase::setName
  ConsumerBase::setConsumerUsageBits
  ConsumerBase::setTransformHint
  ConsumerBase::setMaxAcquiredBufferCount
  ConsumerBase::getSidebandStream

and remove

  BufferItemConsumer::setName
  CpuConsumer::setName
  GLConsumer::setName
  GLConsumer::setDefaultBufferFormat
  GLConsumer::setDefaultBufferDataSpace
  GLConsumer::setTransformHint
  GLConsumer::setMaxAcquiredBufferCount
  SurfaceFlingerConsumer::getSidebandStream

at the same time.

Test: libgui_test
Change-Id: I0b81b7759d6d5a7a89eefdfe95440b262e7fa424
parent 0530f87f

libs/gui/BufferItemConsumer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -49,16 +49,6 @@ BufferItemConsumer::BufferItemConsumer( 


BufferItemConsumer::~BufferItemConsumer() {}



void BufferItemConsumer::setName(const String8& name) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        BI_LOGE("setName: BufferItemConsumer is abandoned!");

        return;

    }

    mName = name;

    mConsumer->setConsumerName(name);

}



void BufferItemConsumer::setBufferFreedListener(

        const wp<BufferFreedListener>& listener) {

    Mutex::Autolock _l(mMutex);

libs/gui/ConsumerBase.cpp

+54 −0
Original line number Diff line number Diff line
@@ -182,6 +182,16 @@ bool ConsumerBase::isAbandoned() { 
    return mAbandoned;

}



void ConsumerBase::setName(const String8& name) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        CB_LOGE("setName: ConsumerBase is abandoned!");

        return;

    }

    mName = name;

    mConsumer->setConsumerName(name);

}



void ConsumerBase::setFrameAvailableListener(

        const wp<FrameAvailableListener>& listener) {

    CB_LOGV("setFrameAvailableListener");
@@ -237,6 +247,50 @@ status_t ConsumerBase::setDefaultBufferDataSpace( 
    return mConsumer->setDefaultBufferDataSpace(defaultDataSpace);

}



status_t ConsumerBase::setConsumerUsageBits(uint64_t usage) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        CB_LOGE("setConsumerUsageBits: ConsumerBase is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setConsumerUsageBits(usage);

}



status_t ConsumerBase::setTransformHint(uint32_t hint) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        CB_LOGE("setTransformHint: ConsumerBase is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setTransformHint(hint);

}



status_t ConsumerBase::setMaxAcquiredBufferCount(int maxAcquiredBuffers) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        CB_LOGE("setMaxAcquiredBufferCount: ConsumerBase is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setMaxAcquiredBufferCount(maxAcquiredBuffers);

}



sp<NativeHandle> ConsumerBase::getSidebandStream() const {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        CB_LOGE("getSidebandStream: ConsumerBase is abandoned!");

        return nullptr;

    }



    sp<NativeHandle> stream;

    status_t err = mConsumer->getSidebandStream(&stream);

    if (err != NO_ERROR) {

        CB_LOGE("failed to get sideband stream: %d", err);

        return nullptr;

    }



    return stream;

}



status_t ConsumerBase::getOccupancyHistory(bool forceFlush,

        std::vector<OccupancyTracker::Segment>* outHistory) {

    Mutex::Autolock _l(mMutex);

libs/gui/CpuConsumer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -44,16 +44,6 @@ CpuConsumer::CpuConsumer(const sp<IGraphicBufferConsumer>& bq, 
    mConsumer->setMaxAcquiredBufferCount(static_cast<int32_t>(maxLockedBuffers));

}



void CpuConsumer::setName(const String8& name) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        CC_LOGE("setName: CpuConsumer is abandoned!");

        return;

    }

    mName = name;

    mConsumer->setConsumerName(name);

}



size_t CpuConsumer::findAcquiredBufferLocked(uintptr_t id) const {

    for (size_t i = 0; i < mMaxLockedBuffers; i++) {

        const auto& ab = mAcquiredBuffers[i];

libs/gui/GLConsumer.cpp

+1 −54
Original line number Diff line number Diff line
@@ -1086,61 +1086,8 @@ void GLConsumer::abandonLocked() { 
    ConsumerBase::abandonLocked();

}



void GLConsumer::setName(const String8& name) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setName: GLConsumer is abandoned!");

        return;

    }

    mName = name;

    mConsumer->setConsumerName(name);

}



status_t GLConsumer::setDefaultBufferFormat(PixelFormat defaultFormat) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setDefaultBufferFormat: GLConsumer is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setDefaultBufferFormat(defaultFormat);

}



status_t GLConsumer::setDefaultBufferDataSpace(

        android_dataspace defaultDataSpace) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setDefaultBufferDataSpace: GLConsumer is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setDefaultBufferDataSpace(defaultDataSpace);

}



status_t GLConsumer::setConsumerUsageBits(uint64_t usage) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setConsumerUsageBits: GLConsumer is abandoned!");

        return NO_INIT;

    }

    usage |= DEFAULT_USAGE_FLAGS;

    return mConsumer->setConsumerUsageBits(usage);

}



status_t GLConsumer::setTransformHint(uint32_t hint) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setTransformHint: GLConsumer is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setTransformHint(hint);

}



status_t GLConsumer::setMaxAcquiredBufferCount(int maxAcquiredBuffers) {

    Mutex::Autolock lock(mMutex);

    if (mAbandoned) {

        GLC_LOGE("setMaxAcquiredBufferCount: GLConsumer is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setMaxAcquiredBufferCount(maxAcquiredBuffers);

    return ConsumerBase::setConsumerUsageBits(usage | DEFAULT_USAGE_FLAGS);

}



void GLConsumer::dumpLocked(String8& result, const char* prefix) const

libs/gui/include/gui/BufferItemConsumer.h

+0 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ class BufferItemConsumer: public ConsumerBase 


    ~BufferItemConsumer() override;



    // set the name of the BufferItemConsumer that will be used to identify it in

    // log messages.

    void setName(const String8& name);



    // setBufferFreedListener sets the listener object that will be notified

    // when an old buffer is being freed.

    void setBufferFreedListener(const wp<BufferFreedListener>& listener);