From acbd340e84edae8dadd8dae41b71f2474d1094c8 Mon Sep 17 00:00:00 2001 From: claincly Date: Thu, 20 Apr 2023 17:02:02 +0100 Subject: [PATCH] Rename INPUT_TYPE_TEXID, and cleanup. PiperOrigin-RevId: 525761936 --- .../androidx/media3/common/VideoFrameProcessor.java | 12 ++++++------ .../media3/effect/DefaultVideoFrameProcessor.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java b/libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java index a6157ce66f..d8a5d1136e 100644 --- a/libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java +++ b/libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java @@ -48,22 +48,22 @@ public interface VideoFrameProcessor { // TODO(b/243036513): Allow effects to be replaced. /** * Specifies how the input frames are made available to the {@link VideoFrameProcessor}. One of - * {@link #INPUT_TYPE_SURFACE}, {@link #INPUT_TYPE_BITMAP} or {@link #INPUT_TYPE_TEXID}. + * {@link #INPUT_TYPE_SURFACE}, {@link #INPUT_TYPE_BITMAP} or {@link #INPUT_TYPE_TEXTURE_ID}. */ @Documented @Retention(RetentionPolicy.SOURCE) @Target(TYPE_USE) - @IntDef({INPUT_TYPE_SURFACE, INPUT_TYPE_BITMAP, INPUT_TYPE_TEXID}) - public @interface InputType {} + @IntDef({INPUT_TYPE_SURFACE, INPUT_TYPE_BITMAP, INPUT_TYPE_TEXTURE_ID}) + @interface InputType {} /** Input frames come from a {@link #getInputSurface surface}. */ - public static final int INPUT_TYPE_SURFACE = 1; + int INPUT_TYPE_SURFACE = 1; /** Input frames come from a {@link Bitmap}. */ - public static final int INPUT_TYPE_BITMAP = 2; + int INPUT_TYPE_BITMAP = 2; /** * Input frames come from a {@linkplain android.opengl.GLES10#GL_TEXTURE_2D traditional GLES * texture}. */ - public static final int INPUT_TYPE_TEXID = 3; + int INPUT_TYPE_TEXTURE_ID = 3; /** A factory for {@link VideoFrameProcessor} instances. */ interface Factory { 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 1b4a5918d6..eb783fe19d 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java @@ -288,7 +288,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { new BitmapTextureManager(inputShaderProgram, videoFrameProcessingTaskExecutor); inputShaderProgram.setInputListener(inputBitmapTextureManager); break; - case VideoFrameProcessor.INPUT_TYPE_TEXID: // fall through + case VideoFrameProcessor.INPUT_TYPE_TEXTURE_ID: // fall through default: throw new VideoFrameProcessingException("Input type not supported yet"); }