From 9a4e083b4ec6286b94f7e2bd7feefaaa12cabde7 Mon Sep 17 00:00:00 2001 From: eguven Date: Thu, 12 Apr 2018 10:17:57 -0700 Subject: [PATCH] Blacklist Philips QM163E from setOutputSurface Issue: #4104 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192629223 --- RELEASENOTES.md | 5 +++-- .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 1f366a0c687..54537ce844a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -61,8 +61,9 @@ not include all of the playlist's variants. * Fix ClearKey decryption error if the key contains a forward slash ([#4075](https://github.com/google/ExoPlayer/issues/4075)). -* Fix IllegalStateException when switching surface on Huawei P9 Lite - ([#4084](https://github.com/google/ExoPlayer/issues/4084)). +* Fix crash when switching surface on Huawei P9 Lite + ([#4084](https://github.com/google/ExoPlayer/issues/4084)), and Philips QM163E + ([#4104](https://github.com/google/ExoPlayer/issues/4104)). ### 2.7.3 ### 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 1ae81e9b840..297db3531eb 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 @@ -1143,8 +1143,9 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) { // https://github.com/google/ExoPlayer/issues/3439, // https://github.com/google/ExoPlayer/issues/3724, // https://github.com/google/ExoPlayer/issues/3835, - // https://github.com/google/ExoPlayer/issues/4006 and - // https://github.com/google/ExoPlayer/issues/4084. + // https://github.com/google/ExoPlayer/issues/4006, + // https://github.com/google/ExoPlayer/issues/4084, + // https://github.com/google/ExoPlayer/issues/4104. return (("deb".equals(Util.DEVICE) // Nexus 7 (2013) || "flo".equals(Util.DEVICE) // Nexus 7 (2013) || "mido".equals(Util.DEVICE) // Redmi Note 4 @@ -1156,6 +1157,7 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) { || Util.DEVICE.startsWith("panell_") // Motorola Moto C Plus || "F3311".equals(Util.DEVICE) // Sony Xperia E5 || "M5c".equals(Util.DEVICE) // Meizu M5C + || "QM16XE_U".equals(Util.DEVICE) // Philips QM163E || "A7010a48".equals(Util.DEVICE)) // Lenovo K4 Note && "OMX.MTK.VIDEO.DECODER.AVC".equals(name)) || (("ALE-L21".equals(Util.MODEL) // Huawei P8 Lite