From 2ed55d97d1d56837d844abd09aa906e41d323b18 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 19 Jul 2016 05:27:49 -0700 Subject: [PATCH] Work around broken VP8 decoders. Issue: #548 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127821150 --- .../exoplayer2/mediacodec/MediaCodecUtil.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index ddecb03df7..639905ca3c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -256,13 +256,19 @@ public final class MediaCodecUtil { return false; } - // Work around an issue where the VP8 decoder on Samsung Galaxy S3/S4 Mini does not render - // video. + // Work around https://github.com/google/ExoPlayer/issues/548 + // VP8 decoder on Samsung Galaxy S3/S4/S4 Mini/Tab 3 does not render video. if (Util.SDK_INT <= 19 && Util.DEVICE != null - && (Util.DEVICE.startsWith("d2") || Util.DEVICE.startsWith("serrano")) + && (Util.DEVICE.startsWith("d2") || Util.DEVICE.startsWith("serrano") + || Util.DEVICE.startsWith("jflte") || Util.DEVICE.startsWith("santos")) && "samsung".equals(Util.MANUFACTURER) && name.equals("OMX.SEC.vp8.dec")) { return false; } + // VP8 decoder on Samsung Galaxy S4 cannot be queried. + if (Util.SDK_INT <= 19 && Util.DEVICE != null && Util.DEVICE.startsWith("jflte") + && "OMX.qcom.video.decoder.vp8".equals(name)) { + return false; + } return true; }