diff --git a/libraries/effect/src/main/java/androidx/media3/effect/InternalTextureManager.java b/libraries/effect/src/main/java/androidx/media3/effect/BitmapTextureManager.java similarity index 97% rename from libraries/effect/src/main/java/androidx/media3/effect/InternalTextureManager.java rename to libraries/effect/src/main/java/androidx/media3/effect/BitmapTextureManager.java index 416ef447fb..69c19d838e 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/InternalTextureManager.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/BitmapTextureManager.java @@ -38,7 +38,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; *

Public methods in this class can be called from any thread. */ @UnstableApi -/* package */ final class InternalTextureManager implements GlShaderProgram.InputListener { +/* package */ final class BitmapTextureManager implements GlShaderProgram.InputListener { private final GlShaderProgram shaderProgram; private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor; // The queue holds all bitmaps with one or more frames pending to be sent downstream. @@ -55,12 +55,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; /** * Creates a new instance. * - * @param shaderProgram The {@link GlShaderProgram} for which this {@code InternalTextureManager} + * @param shaderProgram The {@link GlShaderProgram} for which this {@code BitmapTextureManager} * will be set as the {@link GlShaderProgram.InputListener}. * @param videoFrameProcessingTaskExecutor The {@link VideoFrameProcessingTaskExecutor} that the * methods of this class run on. */ - public InternalTextureManager( + public BitmapTextureManager( GlShaderProgram shaderProgram, VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor) { this.shaderProgram = shaderProgram; 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 8f7352542d..22880751d8 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java @@ -252,7 +252,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { private final EGLDisplay eglDisplay; private final EGLContext eglContext; private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor; - private @MonotonicNonNull InternalTextureManager inputInternalTextureManager; + private @MonotonicNonNull BitmapTextureManager inputBitmapTextureManager; private @MonotonicNonNull ExternalTextureManager inputExternalTextureManager; private final boolean releaseFramesAutomatically; private final FinalShaderProgramWrapper finalShaderProgramWrapper; @@ -287,9 +287,9 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { (ExternalShaderProgram) inputShaderProgram, videoFrameProcessingTaskExecutor); inputShaderProgram.setInputListener(inputExternalTextureManager); } else { - inputInternalTextureManager = - new InternalTextureManager(inputShaderProgram, videoFrameProcessingTaskExecutor); - inputShaderProgram.setInputListener(inputInternalTextureManager); + inputBitmapTextureManager = + new BitmapTextureManager(inputShaderProgram, videoFrameProcessingTaskExecutor); + inputShaderProgram.setInputListener(inputBitmapTextureManager); } finalShaderProgramWrapper = (FinalShaderProgramWrapper) getLast(shaderPrograms); @@ -323,7 +323,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { @Override public void queueInputBitmap(Bitmap inputBitmap, long durationUs, float frameRate) { - checkNotNull(inputInternalTextureManager) + checkNotNull(inputBitmapTextureManager) .queueInputBitmap(inputBitmap, durationUs, frameRate, /* useHdr= */ false); } @@ -369,8 +369,8 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { public void signalEndOfInput() { checkState(!inputStreamEnded); inputStreamEnded = true; - if (inputInternalTextureManager != null) { - videoFrameProcessingTaskExecutor.submit(inputInternalTextureManager::signalEndOfInput); + if (inputBitmapTextureManager != null) { + videoFrameProcessingTaskExecutor.submit(inputBitmapTextureManager::signalEndOfInput); } if (inputExternalTextureManager != null) { videoFrameProcessingTaskExecutor.submit(inputExternalTextureManager::signalEndOfInput);