From 38d653c9272816e092fc241b51999a5595ab8aaf Mon Sep 17 00:00:00 2001 From: magjed Date: Wed, 6 Apr 2016 02:26:24 -0700 Subject: [PATCH] Revert of Switch to using EGL 1.0 for rendering and HW codec. (patchset #1 id:1 of https://codereview.webrtc.org/1829923002/ ) Reason for revert: EGL 1.4 was not the cause of the deadlock. See https://bugs.chromium.org/p/webrtc/issues/detail?id=5702 for more info. Original issue's description: > 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 > > Committed: https://chromium.googlesource.com/external/webrtc/+/887a19b9d2be1ba90a407bd783be081087ffb0b1 BUG=webrtc:5702 TBR=jiayl@webrtc.org,glaznev@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. Review URL: https://codereview.webrtc.org/1866653002 Cr-Commit-Position: refs/heads/master@{#12257} --- webrtc/api/java/android/org/webrtc/EglBase14.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/webrtc/api/java/android/org/webrtc/EglBase14.java b/webrtc/api/java/android/org/webrtc/EglBase14.java index 4329c36e75..6b406228ce 100644 --- a/webrtc/api/java/android/org/webrtc/EglBase14.java +++ b/webrtc/api/java/android/org/webrtc/EglBase14.java @@ -38,13 +38,10 @@ 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: forced to false."); - return false; + Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION + + ". isEGL14Supported: " + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION)); + return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION); } public static class Context extends EglBase.Context {