From ff8b3ebfb84dcc8d6eb0d0786a53cd855f82402d Mon Sep 17 00:00:00 2001 From: Anton Potekhin Date: Tue, 29 May 2018 10:28:17 +0300 Subject: [PATCH] Blacklist Moto C from setOutputSurface Issue: #4315 --- .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java index 579f7c45f4..f6058bb7a0 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java @@ -1179,6 +1179,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { // https://github.com/google/ExoPlayer/issues/4084, // https://github.com/google/ExoPlayer/issues/4104. // https://github.com/google/ExoPlayer/issues/4134. + // https://github.com/google/ExoPlayer/issues/4315 return (("deb".equals(Util.DEVICE) // Nexus 7 (2013) || "flo".equals(Util.DEVICE) // Nexus 7 (2013) || "mido".equals(Util.DEVICE) // Redmi Note 4 @@ -1192,7 +1193,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { || "M5c".equals(Util.DEVICE) // Meizu M5C || "QM16XE_U".equals(Util.DEVICE) // Philips QM163E || "A7010a48".equals(Util.DEVICE) // Lenovo K4 Note - || "woods_f".equals(Util.MODEL)) // Moto E (4) + || "woods_f".equals(Util.MODEL) // Moto E (4) + || "watson".equals(Util.DEVICE)) // Moto C && "OMX.MTK.VIDEO.DECODER.AVC".equals(name)) || (("ALE-L21".equals(Util.MODEL) // Huawei P8 Lite || "CAM-L21".equals(Util.MODEL)) // Huawei Y6II