From 9bcd1069b110fc7158f630905d93ecbe17da5a1f Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 4 Jan 2016 09:04:30 -0800 Subject: [PATCH] Blacklist CIPVorbisDecoder. Issue: #1111 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=111326378 --- .../com/google/android/exoplayer/MediaCodecUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 ab428d6da8..7a46050f69 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java @@ -184,10 +184,12 @@ public final class MediaCodecUtil { } // Work around broken audio decoders. - if ((Util.SDK_INT < 18 && "CIPAACDecoder".equals(name)) - || (Util.SDK_INT < 18 && "CIPMP3Decoder".equals(name)) - || (Util.SDK_INT < 20 && "AACDecoder".equals(name)) - || (Util.SDK_INT < 20 && "MP3Decoder".equals(name))) { + if (Util.SDK_INT < 21 + && ("CIPAACDecoder".equals(name)) + || "CIPMP3Decoder".equals(name) + || "CIPVorbisDecoder".equals(name) + || "AACDecoder".equals(name) + || "MP3Decoder".equals(name)) { return false; }