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

Commit 5a60fd1c authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 8ffab243: Merge "MediaCodec: remove legacy-setsurface experiment from... 

am 8ffab243: Merge "MediaCodec: remove legacy-setsurface experiment from setOutputSurface" into mnc-dev

* commit '8ffab243':
  MediaCodec: remove legacy-setsurface experiment from setOutputSurface
parents 59322ac6 8ffab243

media/libstagefright/ACodec.cpp

+1 −3
Original line number Diff line number Diff line
@@ -4557,9 +4557,7 @@ bool ACodec::BaseState::onMessageReceived(const sp<AMessage> &msg) { 
            sp<RefBase> obj;

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



            status_t err =

                ADebug::isExperimentEnabled("legacy-setsurface") ? BAD_VALUE :

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

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



            sp<AMessage> response = new AMessage;

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