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

Commit 6be8aa7e authored by Brian Lindahl's avatar Brian Lindahl
Browse files

Fix deadlock in MediaCodec::configure when peek default mode is used 

This failure was not caught earlier during testing of this feature
because other test failures were hiding this one.

Bug: 220266078
Test: atest android.media.decoder.cts.DecoderTest#testTunneledVideoPeekOffAvc
Change-Id: I0228d87d96ab79bce6546d4c9f2b2ea73c60d79e
parent 813869b7

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;