From c4930c4bb67b9dd14ab9b4e9c157c082ae7c9ba9 Mon Sep 17 00:00:00 2001 From: dancho Date: Tue, 27 Aug 2024 03:21:27 -0700 Subject: [PATCH] Default to OpenGL 3.0 context in DVFP OpenGL ES 3.0 likely can be used since Android 18. Moving to a higher version context more often can make sharing GL context easier for apps PiperOrigin-RevId: 667915331 --- .../androidx/media3/effect/DefaultVideoFrameProcessor.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java index 77211b0c6f..d0b6f08732 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java @@ -20,7 +20,6 @@ import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkStateNotNull; import static androidx.media3.common.util.GlUtil.getDefaultEglDisplay; -import static androidx.media3.common.util.Util.SDK_INT; import static androidx.media3.effect.DebugTraceUtil.COMPONENT_VFP; import static androidx.media3.effect.DebugTraceUtil.EVENT_RECEIVE_END_OF_ALL_INPUT; import static androidx.media3.effect.DebugTraceUtil.EVENT_REGISTER_NEW_INPUT_STREAM; @@ -1118,11 +1117,6 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { private static Pair createFocusedEglContextWithFallback( GlObjectsProvider glObjectsProvider, EGLDisplay eglDisplay, int[] configAttributes) throws GlUtil.GlException { - if (SDK_INT < 29) { - return createFocusedEglContext( - glObjectsProvider, eglDisplay, /* openGlVersion= */ 2, configAttributes); - } - try { return createFocusedEglContext( glObjectsProvider, eglDisplay, /* openGlVersion= */ 3, configAttributes);