From 23769fe82e66eb32a626acea4c3e7f54be170d2b Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 16 May 2016 08:13:19 -0700 Subject: [PATCH] Work around broken AAC decoder. Issue: #1528 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122421357 --- .../java/com/google/android/exoplayer/MediaCodecUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java index 3c57824b79..05b1395929 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java @@ -195,9 +195,15 @@ public final class MediaCodecUtil { || "MP3Decoder".equals(name)) { return false; } + // Work around https://github.com/google/ExoPlayer/issues/398 if (Util.SDK_INT < 18 && "OMX.SEC.MP3.Decoder".equals(name)) { return false; } + // Work around https://github.com/google/ExoPlayer/issues/1528 + if (Util.SDK_INT < 18 && "OMX.MTK.AUDIO.DECODER.AAC".equals(name) + && "a70".equals(Util.DEVICE)) { + return false; + } // Work around an issue where creating a particular MP3 decoder on some devices on platform API // version 16 crashes mediaserver.