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

Commit d5ab37a1 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Clear the sticky EOS flags when transitioning to LOADED state"

parents 6eb50f7a 16572bec

media/libstagefright/ACodec.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3106,11 +3106,6 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { 
    mCodec->mOMX = omx;

    mCodec->mNode = node;



    mCodec->mPortEOS[kPortIndexInput] =

        mCodec->mPortEOS[kPortIndexOutput] = false;



    mCodec->mInputEOSResult = OK;



    {

        sp<AMessage> notify = mCodec->mNotify->dup();

        notify->setInt32("what", ACodec::kWhatComponentAllocated);
@@ -3132,6 +3127,11 @@ ACodec::LoadedState::LoadedState(ACodec *codec) 
void ACodec::LoadedState::stateEntered() {

    ALOGV("[%s] Now Loaded", mCodec->mComponentName.c_str());



    mCodec->mPortEOS[kPortIndexInput] =

        mCodec->mPortEOS[kPortIndexOutput] = false;



    mCodec->mInputEOSResult = OK;



    if (mCodec->mShutdownInProgress) {

        bool keepComponentAllocated = mCodec->mKeepComponentAllocated;