diff --git a/RELEASENOTES.md b/RELEASENOTES.md index b75cccc298..c115472630 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -316,6 +316,8 @@ This release includes the following changes since the * Remove deprecated symbols: * Remove deprecated `DefaultEncoderFactory` constructors. Use `DefaultEncoderFactory.Builder` instead. + * Remove deprecated `SingleFrameGlShaderProgram`. Use + `BaseGlShaderProgram` instead. ### 1.5.0-alpha01 (2024-09-06) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlShaderProgram.java deleted file mode 100644 index 734d4afaf1..0000000000 --- a/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlShaderProgram.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package androidx.media3.effect; - -import androidx.media3.common.util.UnstableApi; - -/** - * Manages a GLSL shader program for processing a frame. Implementations generally copy input pixels - * into an output frame, with changes to pixels specific to the implementation. - * - *

{@code SingleFrameGlShaderProgram} implementations must produce exactly one output frame per - * input frame with the same presentation timestamp. For more flexibility, implement {@link - * GlShaderProgram} directly. - * - *

All methods in this class must be called on the thread that owns the OpenGL context. - * - * @deprecated Use {@link BaseGlShaderProgram} instead. - */ -@UnstableApi -@Deprecated -public abstract class SingleFrameGlShaderProgram extends BaseGlShaderProgram { - - // TODO(b/275384398): Remove this class as it only wraps the BaseGlShaderProgram. - - /** - * Creates a {@code SingleFrameGlShaderProgram} instance. - * - * @param useHighPrecisionColorComponents If {@code false}, uses colors with 8-bit unsigned bytes. - * If {@code true}, use 16-bit (half-precision) floating-point. - */ - public SingleFrameGlShaderProgram(boolean useHighPrecisionColorComponents) { - super(useHighPrecisionColorComponents, /* texturePoolCapacity= */ 1); - } -} diff --git a/libraries/effect/src/main/java/androidx/media3/effect/TimestampWrapper.java b/libraries/effect/src/main/java/androidx/media3/effect/TimestampWrapper.java index b7e6f83631..846a635d8f 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/TimestampWrapper.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/TimestampWrapper.java @@ -47,7 +47,7 @@ public final class TimestampWrapper implements GlEffect { public TimestampWrapper( GlEffect glEffect, @IntRange(from = 0) long startTimeUs, @IntRange(from = 0) long endTimeUs) { // TODO(b/272063508): Allow TimestampWrapper to take in a glEffect that changes the output - // dimensions, likely by moving the configure() method from SingleFrameGlShaderProgram to + // dimensions, likely by moving the configure() method from BaseGlShaderProgram to // GlShaderProgram, so that we can detect the output dimensions of the // glEffect.toGlShaderProgram. checkArgument(