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

Commit 4f195983 authored by Sungtak Lee's avatar Sungtak Lee Committed by Gerrit Code Review
Browse files

Merge changes from topic "c2bq-defer-clear" into main 

* changes:
  C2BqBuffer: defer GraphicBuffer cache clearing after stop()
  Codec2 SimpleC2Component: Do not process any input after stop()
parents 8ad0f403 2e979ed0

media/codec2/components/base/SimpleC2Component.cpp

+1 −0
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ void SimpleC2Component::WorkHandler::onMessageReceived(const sp<AMessage> &msg) 
        case kWhatStop: {

            int32_t err = thiz->onStop();

            thiz->mOutputBlockPool.reset();

            mRunning = false;

            Reply(msg, &err);

            break;

        }

media/codec2/hal/hidl/1.0/utils/Component.cpp

+12 −1
Original line number Diff line number Diff line
@@ -521,7 +521,18 @@ Return<Status> Component::start() { 


Return<Status> Component::stop() {

    InputBufferManager::unregisterFrameData(mListener);

    return static_cast<Status>(mComponent->stop());

    Status status = static_cast<Status>(mComponent->stop());

    {

        std::lock_guard<std::mutex> lock(mBlockPoolsMutex);

        for (auto it = mBlockPools.begin(); it != mBlockPools.end(); ++it) {

            if (it->second->getAllocatorId() == C2PlatformAllocatorStore::BUFFERQUEUE) {

                std::shared_ptr<C2BufferQueueBlockPool> bqPool =

                        std::static_pointer_cast<C2BufferQueueBlockPool>(it->second);

                bqPool->clearDeferredBlocks();

            }

        }

    }

    return status;

}



Return<Status> Component::reset() {

media/codec2/hal/hidl/1.1/utils/Component.cpp

+12 −1
Original line number Diff line number Diff line
@@ -527,7 +527,18 @@ Return<Status> Component::start() { 


Return<Status> Component::stop() {

    InputBufferManager::unregisterFrameData(mListener);

    return static_cast<Status>(mComponent->stop());

    Status status = static_cast<Status>(mComponent->stop());

    {

        std::lock_guard<std::mutex> lock(mBlockPoolsMutex);

        for (auto it = mBlockPools.begin(); it != mBlockPools.end(); ++it) {

            if (it->second->getAllocatorId() == C2PlatformAllocatorStore::BUFFERQUEUE) {

                std::shared_ptr<C2BufferQueueBlockPool> bqPool =

                        std::static_pointer_cast<C2BufferQueueBlockPool>(it->second);

                bqPool->clearDeferredBlocks();

            }

        }

    }

    return status;

}



Return<Status> Component::reset() {

media/codec2/hal/hidl/1.2/utils/Component.cpp

+12 −1
Original line number Diff line number Diff line
@@ -523,7 +523,18 @@ Return<Status> Component::start() { 


Return<Status> Component::stop() {

    InputBufferManager::unregisterFrameData(mListener);

    return static_cast<Status>(mComponent->stop());

    Status status = static_cast<Status>(mComponent->stop());

    {

        std::lock_guard<std::mutex> lock(mBlockPoolsMutex);

        for (auto it = mBlockPools.begin(); it != mBlockPools.end(); ++it) {

            if (it->second->getAllocatorId() == C2PlatformAllocatorStore::BUFFERQUEUE) {

                std::shared_ptr<C2BufferQueueBlockPool> bqPool =

                        std::static_pointer_cast<C2BufferQueueBlockPool>(it->second);

                bqPool->clearDeferredBlocks();

            }

        }

    }

    return status;

}



Return<Status> Component::reset() {

media/codec2/vndk/C2Store.cpp

+23 −3
Original line number Diff line number Diff line
@@ -478,13 +478,25 @@ static C2PooledBlockPool::BufferPoolVer GetBufferPoolVer() { 


class _C2BlockPoolCache {

public:

    _C2BlockPoolCache() : mBlockPoolSeqId(C2BlockPool::PLATFORM_START + 1) {}

    _C2BlockPoolCache() : mBlockPoolSeqId(C2BlockPool::PLATFORM_START + 1) {

        mBqPoolDeferDeallocAfterStop = false;

#ifdef __ANDROID_APEX__

        bool stopHalBeforeSurface = ::android::base::GetBoolProperty(

                "debug.codec2.stop_hal_before_surface", false);

        if (!stopHalBeforeSurface) {

            mBqPoolDeferDeallocAfterStop =

                    ::android::base::GetIntProperty(

                            "debug.codec2.bqpool_dealloc_after_stop", 0) != 0;

        }

#endif

    }



private:

    c2_status_t _createBlockPool(

            C2PlatformAllocatorDesc &allocatorParam,

            std::vector<std::shared_ptr<const C2Component>> components,

            C2BlockPool::local_id_t poolId,

            bool deferDeallocAfterStop,

            std::shared_ptr<C2BlockPool> *pool) {

        std::shared_ptr<C2AllocatorStore> allocatorStore =

                GetCodec2PlatformAllocatorStore();
@@ -548,6 +560,11 @@ private: 
                if (res == C2_OK) {

                    std::shared_ptr<C2BlockPool> ptr(

                            new C2BufferQueueBlockPool(allocator, poolId), deleter);

                    if (deferDeallocAfterStop) {

                        std::shared_ptr<C2BufferQueueBlockPool> bqPool =

                            std::static_pointer_cast<C2BufferQueueBlockPool>(ptr);

                        bqPool->setDeferDeallocationAfterStop();

                    }

                    *pool = ptr;

                    mBlockPools[poolId] = ptr;

                    mComponents[poolId].insert(
@@ -603,7 +620,8 @@ public: 
            std::vector<std::shared_ptr<const C2Component>> components,

            std::shared_ptr<C2BlockPool> *pool) {

        std::unique_lock lock(mMutex);

        return _createBlockPool(allocator, components, mBlockPoolSeqId++, pool);

        return _createBlockPool(allocator, components, mBlockPoolSeqId++,

                                mBqPoolDeferDeallocAfterStop, pool);

    }
@@ -638,7 +656,7 @@ public: 
            C2PlatformAllocatorDesc allocator;

            allocator.allocatorId = C2PlatformAllocatorStore::BUFFERQUEUE;

            return _createBlockPool(

                    allocator, {component}, blockPoolId, pool);

                    allocator, {component}, blockPoolId, mBqPoolDeferDeallocAfterStop, pool);

        }

        return C2_NOT_FOUND;

    }
@@ -651,6 +669,8 @@ private: 


    std::map<C2BlockPool::local_id_t, std::weak_ptr<C2BlockPool>> mBlockPools;

    std::map<C2BlockPool::local_id_t, std::vector<std::weak_ptr<const C2Component>>> mComponents;



    bool mBqPoolDeferDeallocAfterStop;

};



static std::unique_ptr<_C2BlockPoolCache> sBlockPoolCache =