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

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

Merge "ACodec: defer setSurface at OutputPortSettingsChangedState" am: a16b76a3 

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

Change-Id: I10c4c082adf55fd6029d02a97a3bdc6deec5282d
parents 4809ee3e a16b76a3

media/libstagefright/ACodec.cpp

+25 −6
Original line number Diff line number Diff line
@@ -5804,17 +5804,19 @@ bool ACodec::BaseState::onMessageReceived(const sp<AMessage> &msg) { 


        case ACodec::kWhatSetSurface:

        {

            sp<AReplyToken> replyID;

            CHECK(msg->senderAwaitsResponse(&replyID));



            sp<RefBase> obj;

            CHECK(msg->findObject("surface", &obj));



            status_t err = mCodec->handleSetSurface(static_cast<Surface *>(obj.get()));



            sp<AReplyToken> replyID;

            if (msg->senderAwaitsResponse(&replyID)) {

                sp<AMessage> response = new AMessage;

                response->setInt32("err", err);

                response->postReply(replyID);

            } else if (err != OK) {

                mCodec->signalError(OMX_ErrorUndefined, err);

            }

            break;

        }
@@ -8310,6 +8312,23 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived( 
            break;

        }



        case kWhatSetSurface:

        {

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



            sp<AReplyToken> replyID;

            CHECK(msg->senderAwaitsResponse(&replyID));



            mCodec->deferMessage(msg);



            sp<AMessage> response = new AMessage;

            response->setInt32("err", OK);

            response->postReply(replyID);



            handled = true;

            break;

        }



        case kWhatCheckIfStuck:

        {

            int32_t generation = 0;