From db88222660d9417e9e102870b095f8efd9f2fa9b Mon Sep 17 00:00:00 2001 From: Dmitry Kostyrev Date: Mon, 2 Jul 2018 20:27:46 +0300 Subject: [PATCH] Opt out of using DummySurface on Asus Zenfone Go Issue: #4460 --- .../exoplayer2/video/MediaCodecVideoRenderer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 1e1545fc26..ed127549cb 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 @@ -1178,9 +1178,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { *

If true is returned then use of {@link DummySurface} is disabled. */ private static boolean codecNeedsDummySurfaceWorkaround(String name) { - // Work around https://github.com/google/ExoPlayer/issues/4419. - return ("Amazon".equals(Util.MANUFACTURER) && "AFTN".equals(Util.MODEL)) // FireTV 4K - && "OMX.amlogic.avc.decoder.awesome".equals(name); + // Work around https://github.com/google/ExoPlayer/issues/4419, + // https://github.com/google/ExoPlayer/issues/4460. + return (("Amazon".equals(Util.MANUFACTURER) && "AFTN".equals(Util.MODEL)) // FireTV 4K + && "OMX.amlogic.avc.decoder.awesome".equals(name)) + || (("asus".equals(Util.MANUFACTURER) && "ZB500KL".equals(Util.MODEL)) // Asus Zenfone Go + && "OMX.qcom.video.decoder.avc".equals(name)); } /**