From a28b691cedf231fd1dc57666cde61b56c3b94cde Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 2 Mar 2023 15:09:31 +0000 Subject: [PATCH] Fix name for `FrameCacheGlShaderProgram` This implements `GlShaderProgram` (and is GL-specific). PiperOrigin-RevId: 513528160 --- .../src/main/java/androidx/media3/effect/FrameCache.java | 2 +- ...CacheShaderProgram.java => FrameCacheGlShaderProgram.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename libraries/effect/src/main/java/androidx/media3/effect/{FrameCacheShaderProgram.java => FrameCacheGlShaderProgram.java} (97%) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/FrameCache.java b/libraries/effect/src/main/java/androidx/media3/effect/FrameCache.java index f4d171a819..e6865fc0b5 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/FrameCache.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/FrameCache.java @@ -52,6 +52,6 @@ public final class FrameCache implements GlEffect { @Override public GlShaderProgram toGlShaderProgram(Context context, boolean useHdr) throws VideoFrameProcessingException { - return new FrameCacheShaderProgram(context, capacity, useHdr); + return new FrameCacheGlShaderProgram(context, capacity, useHdr); } } diff --git a/libraries/effect/src/main/java/androidx/media3/effect/FrameCacheShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/FrameCacheGlShaderProgram.java similarity index 97% rename from libraries/effect/src/main/java/androidx/media3/effect/FrameCacheShaderProgram.java rename to libraries/effect/src/main/java/androidx/media3/effect/FrameCacheGlShaderProgram.java index f0a89c984c..781bbaa9d0 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/FrameCacheShaderProgram.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/FrameCacheGlShaderProgram.java @@ -35,7 +35,7 @@ import java.util.concurrent.Executor; * *

Implements {@link FrameCache}. */ -/* package */ final class FrameCacheShaderProgram implements GlShaderProgram { +/* package */ final class FrameCacheGlShaderProgram implements GlShaderProgram { private static final String VERTEX_SHADER_TRANSFORMATION_ES2_PATH = "shaders/vertex_shader_transformation_es2.glsl"; private static final String FRAGMENT_SHADER_TRANSFORMATION_ES2_PATH = @@ -53,7 +53,7 @@ import java.util.concurrent.Executor; private Executor errorListenerExecutor; /** Creates a new instance. */ - public FrameCacheShaderProgram(Context context, int capacity, boolean useHdr) + public FrameCacheGlShaderProgram(Context context, int capacity, boolean useHdr) throws VideoFrameProcessingException { freeOutputTextures = new ArrayDeque<>(); inUseOutputTextures = new ArrayDeque<>();