From 7129d84efda22696228737f277ea127b3004416a Mon Sep 17 00:00:00 2001 From: kimvde Date: Tue, 7 Sep 2021 11:17:47 +0100 Subject: [PATCH] Avoid OMX.qti.audio.decoder.flac on API level < 32 Before, this decoder was avoided on API levels < 30. #minor-release Issue:#9349 PiperOrigin-RevId: 395209684 --- .../google/android/exoplayer2/mediacodec/MediaCodecUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index ad16170b0b..40e75c06bb 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -580,10 +580,10 @@ public final class MediaCodecUtil { } } - if (Util.SDK_INT < 30 && decoderInfos.size() > 1) { + if (Util.SDK_INT < 32 && decoderInfos.size() > 1) { String firstCodecName = decoderInfos.get(0).name; // Prefer anything other than OMX.qti.audio.decoder.flac on older devices. See [Internal - // ref: b/147278539] and [Internal ref: b/147354613]. + // ref: b/199124812]. if ("OMX.qti.audio.decoder.flac".equals(firstCodecName)) { decoderInfos.add(decoderInfos.remove(0)); }