Commit e26cad1a by olly Committed by Oliver Woodman

Blacklist Huawei P9 Lite from setOutputSurface

Issue: #4084

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191716636
parent 6ea79c8a
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
`BaseRenderer.onStreamChanged`. `BaseRenderer.onStreamChanged`.
* HLS: Fix playlist loading error propagation when the current selection does * HLS: Fix playlist loading error propagation when the current selection does
not include all of the playlist's variants. not include all of the playlist's variants.
* Fix IllegalStateException when switching surface on Huawei P9 Lite
([#4084](https://github.com/google/ExoPlayer/issues/4084)).
### 2.7.3 ### ### 2.7.3 ###
......
...@@ -1142,8 +1142,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -1142,8 +1142,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
// https://github.com/google/ExoPlayer/issues/3355, // https://github.com/google/ExoPlayer/issues/3355,
// https://github.com/google/ExoPlayer/issues/3439, // https://github.com/google/ExoPlayer/issues/3439,
// https://github.com/google/ExoPlayer/issues/3724, // https://github.com/google/ExoPlayer/issues/3724,
// https://github.com/google/ExoPlayer/issues/3835 and // https://github.com/google/ExoPlayer/issues/3835,
// https://github.com/google/ExoPlayer/issues/4006. // https://github.com/google/ExoPlayer/issues/4006 and
// https://github.com/google/ExoPlayer/issues/4084.
return (("deb".equals(Util.DEVICE) // Nexus 7 (2013) return (("deb".equals(Util.DEVICE) // Nexus 7 (2013)
|| "flo".equals(Util.DEVICE) // Nexus 7 (2013) || "flo".equals(Util.DEVICE) // Nexus 7 (2013)
|| "mido".equals(Util.DEVICE) // Redmi Note 4 || "mido".equals(Util.DEVICE) // Redmi Note 4
...@@ -1159,7 +1160,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -1159,7 +1160,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
&& "OMX.MTK.VIDEO.DECODER.AVC".equals(name)) && "OMX.MTK.VIDEO.DECODER.AVC".equals(name))
|| (("ALE-L21".equals(Util.MODEL) // Huawei P8 Lite || (("ALE-L21".equals(Util.MODEL) // Huawei P8 Lite
|| "CAM-L21".equals(Util.MODEL)) // Huawei Y6II || "CAM-L21".equals(Util.MODEL)) // Huawei Y6II
&& "OMX.k3.video.decoder.avc".equals(name)); && "OMX.k3.video.decoder.avc".equals(name))
|| (("HUAWEI VNS-L21".equals(Util.MODEL)) // Huawei P9 Lite
&& "OMX.IMG.MSVDX.Decoder.AVC".equals(name));
} }
protected static final class CodecMaxValues { protected static final class CodecMaxValues {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment