From 887a19b9d2be1ba90a407bd783be081087ffb0b1 Mon Sep 17 00:00:00 2001 From: Alex Glaznev Date: Wed, 23 Mar 2016 15:01:44 -0700 Subject: [PATCH] Switch to using EGL 1.0 for rendering and HW codec. Using EGL 1.4 may cause texture rendering deadlock on some Android devices. R=jiayl@webrtc.org Review URL: https://codereview.webrtc.org/1829923002 . Cr-Commit-Position: refs/heads/master@{#12109} --- webrtc/api/java/android/org/webrtc/EglBase14.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webrtc/api/java/android/org/webrtc/EglBase14.java b/webrtc/api/java/android/org/webrtc/EglBase14.java index f23ca949e4..5b377e0bad 100644 --- a/webrtc/api/java/android/org/webrtc/EglBase14.java +++ b/webrtc/api/java/android/org/webrtc/EglBase14.java @@ -38,10 +38,13 @@ public final class EglBase14 extends EglBase { // EGL 1.4 is supported from API 17. But EGLExt that is used for setting presentation // time stamp on a surface is supported from 18 so we require 18. + // Currently EGL 1.4 support is disabled for all devices, since it causes deadlock + // in Android view rendering on some devices. + // TODO(magjed,glaznev) - investigate if it can be re-enabled back. public static boolean isEGL14Supported() { - Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION - + ". isEGL14Supported: " + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION)); - return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION); + Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION + + ". isEGL14Supported: forced to false."); + return false; } public static class Context extends EglBase.Context {