summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Lindahl <blindahl@google.com>2022-05-31 17:10:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-05-31 17:10:25 +0000
commit97b67e31de79280f5315b1deac4b99bda913b55a (patch)
tree01d6731ec372d0f3e8201cd012c4adb2c8ab3bc3
parente492c98cefbbb4dca94a44021598f1998ed801e5 (diff)
parent6be8aa7ee29a9088814f5a23f9da2e4d744c2d42 (diff)
downloadav-97b67e31de79280f5315b1deac4b99bda913b55a.tar.gz
Merge "Fix deadlock in MediaCodec::configure when peek default mode is used" into tm-dev
-rw-r--r--media/libstagefright/MediaCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index a2d86ab1f0..ab1368f8ad 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -3974,7 +3974,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
if (mTunneled && (mTunnelPeekState == TunnelPeekState::kLegacyMode)) {
sp<AMessage> params = new AMessage;
params->setInt32("android._tunnel-peek-set-legacy", 1);
- setParameters(params);
+ onSetParameters(params);
}
int32_t background = 0;