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

Commit 0bdc346c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2: add get consumeusage for C2BufferQueueBlockPool" am: ba2bc909... 

Merge "codec2: add get consumeusage for C2BufferQueueBlockPool" am: ba2bc909 am: 6cd39dfe am: db0b0ae6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1978268



Change-Id: Id86f392fb90260a44915e8ee51a2a1e0bc3a0618
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b05437b5 db0b0ae6

media/codec2/vndk/include/C2BqBufferPriv.h

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ public: 
            uint32_t generationId,

            uint64_t consumerUsage);



    virtual void getConsumerUsage(uint64_t *consumerUsage);



private:

    const std::shared_ptr<C2Allocator> mAllocator;

    const local_id_t mLocalId;
@@ -138,7 +140,6 @@ public: 
                uint32_t toGeneration, uint64_t toUsage, uint64_t toBqId,

                android::sp<android::GraphicBuffer>& graphicBuffer, uint32_t oldGeneration,

                std::shared_ptr<C2SurfaceSyncMemory> syncMem);



private:

    friend struct _C2BlockFactory;

media/codec2/vndk/platform/C2BqBuffer.cpp

+15 −2
Original line number Diff line number Diff line
@@ -571,8 +571,8 @@ private: 
public:

    Impl(const std::shared_ptr<C2Allocator> &allocator)

        : mInit(C2_OK), mProducerId(0), mGeneration(0),

          mDqFailure(0), mLastDqTs(0), mLastDqLogTs(0),

          mAllocator(allocator) {

          mConsumerUsage(0), mDqFailure(0), mLastDqTs(0),

          mLastDqLogTs(0), mAllocator(allocator) {

    }



    ~Impl() {
@@ -747,6 +747,11 @@ public: 
                  "bqId: %llu migrated buffers # %d",

                  generation, (unsigned long long)producerId, migrated);

        }

        mConsumerUsage = usage;

    }



    void getConsumerUsage(uint64_t *consumeUsage) {

        *consumeUsage = mConsumerUsage;

    }



private:
@@ -755,6 +760,7 @@ private: 
    c2_status_t mInit;

    uint64_t mProducerId;

    uint32_t mGeneration;

    uint64_t mConsumerUsage;

    OnRenderCallback mRenderCallback;



    size_t mDqFailure;
@@ -1086,3 +1092,10 @@ void C2BufferQueueBlockPool::setRenderCallback(const OnRenderCallback &renderCal 
        mImpl->setRenderCallback(renderCallback);

    }

}



void C2BufferQueueBlockPool::getConsumerUsage(uint64_t *consumeUsage) {

    if (mImpl) {

        mImpl->getConsumerUsage(consumeUsage);

    }

}