From 2dab21ab4eaad67d332f16de212f29e4e8b1721d Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 13 Feb 2018 10:14:17 -0800 Subject: [PATCH] Add Y611 to setOutputSurfaceWorkaround Issue: #3724 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=185548632 --- RELEASENOTES.md | 5 +++-- .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 230aa57904..34de0baca8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -91,8 +91,9 @@ * Fix handling of ad tags where ad groups are out of order ([#3716](https://github.com/google/ExoPlayer/issues/3716)). * `EventLogger` moved from the demo app into the core library. -* Fix ANR issue on Huawei P8 Lite - ([#3724](https://github.com/google/ExoPlayer/issues/3724)). +* Fix ANR issue on the Huawei P8 Lite, Huawei Y6II and Moto C+ + ([#3724](https://github.com/google/ExoPlayer/issues/3724), + [#3835](https://github.com/google/ExoPlayer/issues/3835)). * Fix potential NPE when removing media sources from a DynamicConcatenatingMediaSource ([#3796](https://github.com/google/ExoPlayer/issues/3796)). 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 3fe863a96b..a897f3194c 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 @@ -1094,7 +1094,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { || "BRAVIA_ATV2".equals(Util.DEVICE) || "panell_s".equals(Util.DEVICE)) && "OMX.MTK.VIDEO.DECODER.AVC".equals(name)) - || ("OMX.k3.video.decoder.avc".equals(name) && "ALE-L21".equals(Util.MODEL)); + || (("ALE-L21".equals(Util.MODEL) || "CAM-L21".equals(Util.MODEL)) + && "OMX.k3.video.decoder.avc".equals(name)); } /**