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

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

Merge "Ignore all flush-complete notifications with port == OMX_ALL"

parents 3eeab1a7 0af94192

media/libstagefright/ACodec.cpp

+12 −0
Original line number Original line Diff line number Diff line
@@ -1190,6 +1190,17 @@ bool ACodec::BaseState::onOMXMessage(const sp<AMessage> &msg) { 
            CHECK(msg->findInt32("data1", &data1));

            CHECK(msg->findInt32("data1", &data1));

            CHECK(msg->findInt32("data2", &data2));

            CHECK(msg->findInt32("data2", &data2));





            if (event == OMX_EventCmdComplete

                    && data1 == OMX_CommandFlush

                    && data2 == (int32_t)OMX_ALL) {

                // Use of this notification is not consistent across

                // implementations. We'll drop this notification and rely

                // on flush-complete notifications on the individual port

                // indices instead.



                return true;

            }



            return onOMXEvent(

            return onOMXEvent(

                    static_cast<OMX_EVENTTYPE>(event),

                    static_cast<OMX_EVENTTYPE>(event),

                    static_cast<OMX_U32>(data1),

                    static_cast<OMX_U32>(data1),
@@ -2119,6 +2130,7 @@ bool ACodec::ExecutingToIdleState::onOMXEvent( 
            return BaseState::onOMXEvent(event, data1, data2);

            return BaseState::onOMXEvent(event, data1, data2);

    }

    }

}

}



void ACodec::ExecutingToIdleState::changeStateIfWeOwnAllBuffers() {

void ACodec::ExecutingToIdleState::changeStateIfWeOwnAllBuffers() {

    if (mCodec->allYourBuffersAreBelongToUs()) {

    if (mCodec->allYourBuffersAreBelongToUs()) {

        CHECK_EQ(mCodec->mOMX->sendCommand(

        CHECK_EQ(mCodec->mOMX->sendCommand(