From 9b4e9723e5f459ac86e621ae01a70929b4aba16e Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 12 Oct 2015 12:28:14 +0100 Subject: [PATCH] Don't use SEC VP8 decoder on Galaxy S3s. The only Samsung devices with names starting "d2" that we're aware of are Galaxy S3 variants, and also one Samsung Galaxy Pocket Neo d2aio SAMSUNG-SGH-I747Z. This change speculatively includes that device too because its name is very similar to SAMSUNG-SGH-I747 which is known to be affected. Issue: #548 --- .../java/com/google/android/exoplayer/MediaCodecUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 4a7b362a58..01c814560d 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java @@ -209,8 +209,10 @@ public final class MediaCodecUtil { return false; } - // Work around an issue where the VP8 decoder on Samsung Galaxy S4 Mini does not render video. - if (Util.SDK_INT <= 19 && Util.DEVICE != null && Util.DEVICE.startsWith("serrano") + // Work around an issue where the VP8 decoder on Samsung Galaxy S3/S4 Mini does not render + // video. + if (Util.SDK_INT <= 19 && Util.DEVICE != null + && (Util.DEVICE.startsWith("d2") || Util.DEVICE.startsWith("serrano")) && "samsung".equals(Util.MANUFACTURER) && name.equals("OMX.SEC.vp8.dec")) { return false; }