From 78cdd5fee1ecdb0724620753637a8d719c9482e1 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 18 Dec 2018 19:46:21 +0000 Subject: [PATCH] Merge pull request #5216 from mseroczynski:dev-v2 PiperOrigin-RevId: 225966289 --- .../exoplayer2/mediacodec/MediaCodecUtil.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 893601a859..f6cc6a8344 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 @@ -318,7 +318,20 @@ public final class MediaCodecUtil { } // Work around https://github.com/google/ExoPlayer/issues/4519. - if ("OMX.SEC.mp3.dec".equals(name) && "SM-T530".equals(Util.MODEL)) { + if ("OMX.SEC.mp3.dec".equals(name) + && ("GT-I9152".equals(Util.MODEL) + || "GT-I9515".equals(Util.MODEL) + || "GT-P5220".equals(Util.MODEL) + || "GT-S7580".equals(Util.MODEL) + || "SM-G350".equals(Util.MODEL) + || "SM-T231".equals(Util.MODEL) + || "SM-T530".equals(Util.MODEL))) { + return false; + } + if ("OMX.brcm.audio.mp3.decoder".equals(name) + && ("GT-I9152".equals(Util.MODEL) + || "GT-S7580".equals(Util.MODEL) + || "SM-G350".equals(Util.MODEL))) { return false; }