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

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

Merge "media codec2: Expire waiters from HAL during stop()/release()" into... 

Merge "media codec2: Expire waiters from HAL during stop()/release()" into main am: 42652123 am: 3da88ced

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



Change-Id: I31bd11f8f9f1e18b4740be710463661e36cf82df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a4cd7f4 3da88ced

media/codec2/hal/client/output.cpp

+19 −3
Original line number Diff line number Diff line
@@ -336,9 +336,25 @@ void OutputBufferQueue::expireOldWaiters() { 
}



void OutputBufferQueue::stop() {

    std::shared_ptr<C2SurfaceSyncMemory> oldMem;

    {

        std::scoped_lock<std::mutex> l(mMutex);

        if (mStopped) {

            return;

        }

        mStopped = true;

    mOwner.reset(); // destructor of the block will not triger IGBP::cancel()

        mOwner.reset(); // destructor of the block will not trigger IGBP::cancel()

        // basically configuring null surface

        oldMem = mSyncMem;

        mSyncMem.reset();

        mIgbp.clear();

        mGeneration = 0;

        mBqId = 0;

    }

    {

        std::scoped_lock<std::mutex> l(mOldMutex);

        mOldMem = oldMem;

    }

}



bool OutputBufferQueue::registerBuffer(const C2ConstGraphicBlock& block) {

media/codec2/sfplugin/CCodec.cpp

+17 −2
Original line number Diff line number Diff line
@@ -1923,8 +1923,16 @@ void CCodec::stop(bool pushBlankBuffer) { 
        }

        comp = state->comp;

    }

    status_t err = comp->stop();



    // Note: Logically mChannel->stopUseOutputSurface() should be after comp->stop().

    // But in the case some HAL implementations hang forever on comp->stop().

    // (HAL is waiting for C2Fence until fetchGraphicBlock unblocks and not

    // completing stop()).

    // So we reverse their order for stopUseOutputSurface() to notify C2Fence waiters

    // prior to comp->stop().

    // See also b/300350761.

    mChannel->stopUseOutputSurface(pushBlankBuffer);

    status_t err = comp->stop();

    if (err != C2_OK) {

        // TODO: convert err into status_t

        mCallback->onError(UNKNOWN_ERROR, ACTION_CODE_FATAL);
@@ -2012,8 +2020,15 @@ void CCodec::release(bool sendCallback, bool pushBlankBuffer) { 
        }

        comp = state->comp;

    }

    comp->release();

    // Note: Logically mChannel->stopUseOutputSurface() should be after comp->release().

    // But in the case some HAL implementations hang forever on comp->release().

    // (HAL is waiting for C2Fence until fetchGraphicBlock unblocks and not

    // completing release()).

    // So we reverse their order for stopUseOutputSurface() to notify C2Fence waiters

    // prior to comp->release().

    // See also b/300350761.

    mChannel->stopUseOutputSurface(pushBlankBuffer);

    comp->release();



    {

        Mutexed<State>::Locked state(mState);