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

Commit 67d93552 authored by Chong Zhang's avatar Chong Zhang Committed by Android Git Automerger
Browse files

am b438123f: am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if... 

am b438123f: am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev

* commit 'b438123f':
  MediaCodec: resume codec if state is FLUSHED in async mode
parents 059c8b62 b438123f

media/libstagefright/MediaCodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1336,8 +1336,10 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            CHECK(msg->senderAwaitsResponse(&replyID));



            if (mState == FLUSHED) {

                setState(STARTED);

                mCodec->signalResume();

                PostReplyWithError(replyID, OK);

                break;

            } else if (mState != CONFIGURED) {

                PostReplyWithError(replyID, INVALID_OPERATION);

                break;