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

Commit 97b67e31 authored by Brian Lindahl's avatar Brian Lindahl Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock in MediaCodec::configure when peek default mode is used" into tm-dev

parents e492c98c 6be8aa7e

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3974,7 +3974,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            if (mTunneled && (mTunnelPeekState == TunnelPeekState::kLegacyMode)) {

            if (mTunneled && (mTunnelPeekState == TunnelPeekState::kLegacyMode)) {

                sp<AMessage> params = new AMessage;

                sp<AMessage> params = new AMessage;

                params->setInt32("android._tunnel-peek-set-legacy", 1);

                params->setInt32("android._tunnel-peek-set-legacy", 1);

                setParameters(params);

                onSetParameters(params);

            }

            }





            int32_t background = 0;

            int32_t background = 0;