Effect: Rename FrameProcessor

Rename FrameProcessor to VideoFrameProcessor, and GlEffectsFrameProcessor to DefaultVideoFrameProcessor. Most changes are semi-mechanical, semi-manual find-replace, preserving case: * "FrameProc" -> "VideoFrameProc" (ex. FrameProcessor -> VideoFrameProcessor, and FrameProcessingException -> VideoFrameProcessingException) * "GlEffectsVideoFrameProc" -> "DefaultVideoFrameProc" PiperOrigin-RevId: 509887384

Effect: Rename FrameProcessor
Rename FrameProcessor to VideoFrameProcessor, and GlEffectsFrameProcessor to DefaultVideoFrameProcessor. Most changes are semi-mechanical, semi-manual find-replace, preserving case: * "FrameProc" -> "VideoFrameProc" (ex. FrameProcessor -> VideoFrameProcessor, and FrameProcessingException -> VideoFrameProcessingException) * "GlEffectsVideoFrameProc" -> "DefaultVideoFrameProc" PiperOrigin-RevId: 509887384
413f61b9 · huangdarwin · christosts · 3e5ae92b · 413f61b9 · 413f61b9
Commit 413f61b9 authored Feb 15, 2023 by huangdarwin Committed by christosts Feb 17, 2023
Showing with 484 additions and 471 deletions
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteShaderProgram.java
demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeShaderProgram.java
library/common/src/main/java/com/google/android/exoplayer2/PlaybackException.java
library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java → library/common/src/main/java/com/google/android/exoplayer2/util/VideoFrameProcessingException.java
library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java → library/common/src/main/java/com/google/android/exoplayer2/util/VideoFrameProcessor.java
library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixShaderProgramPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/OverlayShaderProgramPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java
library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlShaderProgramListener.java
library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutShaderProgram.java
library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java
--- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteShaderProgram.java
+++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteShaderProgram.java
@@ -20,10 +20,10 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
 import android.opengl.GLES20;
 import com.google.android.exoplayer2.effect.SingleFrameGlShaderProgram;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 /**
@@ -59,7 +59,7 @@ import java.io.IOException;
   * @param minInnerRadius The lower bound of the radius that is unaffected by the effect.
   * @param maxInnerRadius The upper bound of the radius that is unaffected by the effect.
   * @param outerRadius The radius after which all pixels are black.
-   * @throws FrameProcessingException If a problem occurs while reading shader files.
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files.
   */
  public PeriodicVignetteShaderProgram(
      Context context,
@@ -69,7 +69,7 @@ import java.io.IOException;
      float minInnerRadius,
      float maxInnerRadius,
      float outerRadius)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    super(useHdr);
    checkArgument(minInnerRadius <= maxInnerRadius);
    checkArgument(maxInnerRadius <= outerRadius);
@@ -78,7 +78,7 @@ import java.io.IOException;
    try {
      glProgram = new GlProgram(context, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH);
    } catch (IOException | GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    glProgram.setFloatsUniform("uCenter", new float[] {centerX, centerY});
    glProgram.setFloatsUniform("uOuterRadius", new float[] {outerRadius});
@@ -95,7 +95,8 @@ import java.io.IOException;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    try {
      glProgram.use();
      glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0);
@@ -107,17 +108,17 @@ import java.io.IOException;
      // The four-vertex triangle strip forms a quad.
      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e, presentationTimeUs);
+      throw new VideoFrameProcessingException(e, presentationTimeUs);
    }
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    super.release();
    try {
      glProgram.delete();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }
 }
--- a/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeShaderProgram.java
+++ b/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeShaderProgram.java
@@ -26,9 +26,9 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.effect.GlShaderProgram;
 import com.google.android.exoplayer2.effect.TextureInfo;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.LibraryLoader;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.mediapipe.components.FrameProcessor;
 import com.google.mediapipe.framework.AppTextureFrame;
@@ -112,7 +112,7 @@ import java.util.concurrent.Future;
    futures = new ArrayDeque<>();
    inputListener = new InputListener() {};
    outputListener = new OutputListener() {};
-    errorListener = (frameProcessingException) -> {};
+    errorListener = (videoFrameProcessingException) -> {};
    errorListenerExecutor = MoreExecutors.directExecutor();
    EglManager eglManager = new EglManager(EGL14.eglGetCurrentContext());
    frameProcessor =
@@ -155,7 +155,7 @@ import java.util.concurrent.Future;
    frameProcessor.setAsynchronousErrorListener(
        error ->
            errorListenerExecutor.execute(
-                () -> errorListener.onFrameProcessingError(new FrameProcessingException(error))));
+                () -> errorListener.onError(new VideoFrameProcessingException(error))));
  }
  @Override
@@ -191,7 +191,7 @@ import java.util.concurrent.Future;
    } catch (InterruptedException e) {
      Thread.currentThread().interrupt();
      errorListenerExecutor.execute(
-          () -> errorListener.onFrameProcessingError(new FrameProcessingException(e)));
+          () -> errorListener.onError(new VideoFrameProcessingException(e)));
    }
    if (acceptedFrame) {
      inputListener.onInputFrameProcessed(inputTexture);
@@ -213,9 +213,7 @@ import java.util.concurrent.Future;
                      Thread.currentThread().interrupt();
                      if (errorListener != null) {
                        errorListenerExecutor.execute(
-                            () ->
+                            () -> errorListener.onError(new VideoFrameProcessingException(e)));
-                                errorListener.onFrameProcessingError(
-                                    new FrameProcessingException(e)));
                      }
                    }
                  }
@@ -254,14 +252,12 @@ import java.util.concurrent.Future;
    try {
      if (!singleThreadExecutorService.awaitTermination(RELEASE_WAIT_TIME_MS, MILLISECONDS)) {
        errorListenerExecutor.execute(
-            () ->
+            () -> errorListener.onError(new VideoFrameProcessingException("Release timed out")));
-                errorListener.onFrameProcessingError(
-                    new FrameProcessingException("Release timed out")));
      }
    } catch (InterruptedException e) {
      Thread.currentThread().interrupt();
      errorListenerExecutor.execute(
-          () -> errorListener.onFrameProcessingError(new FrameProcessingException(e)));
+          () -> errorListener.onError(new VideoFrameProcessingException(e)));
    }
    frameProcessor.close();
@@ -294,11 +290,11 @@ import java.util.concurrent.Future;
        futures.remove().get();
      } catch (ExecutionException e) {
        errorListenerExecutor.execute(
-            () -> errorListener.onFrameProcessingError(new FrameProcessingException(e)));
+            () -> errorListener.onError(new VideoFrameProcessingException(e)));
      } catch (InterruptedException e) {
        Thread.currentThread().interrupt();
        errorListenerExecutor.execute(
-            () -> errorListener.onFrameProcessingError(new FrameProcessingException(e)));
+            () -> errorListener.onError(new VideoFrameProcessingException(e)));
      }
    }
  }

--- a/library/common/src/main/java/com/google/android/exoplayer2/PlaybackException.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/PlaybackException.java
@@ -229,10 +229,10 @@ public class PlaybackException extends Exception implements Bundleable {
  // Frame processing errors (7xxx).
-  /** Caused by a failure when initializing a {@link FrameProcessor}. */
+  /** Caused by a failure when initializing a {@link VideoFrameProcessor}. */
-  public static final int ERROR_CODE_FRAME_PROCESSOR_INIT_FAILED = 7000;
+  public static final int ERROR_CODE_VIDEO_FRAME_PROCESSOR_INIT_FAILED = 7000;
-  /** Caused by a failure when processing a frame. */
+  /** Caused by a failure when processing a video frame. */
-  public static final int ERROR_CODE_FRAME_PROCESSING_FAILED = 7001;
+  public static final int ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED = 7001;
  /**
   * Player implementations that want to surface custom errors can use error codes greater than this
@@ -311,10 +311,10 @@ public class PlaybackException extends Exception implements Bundleable {
        return "ERROR_CODE_DRM_DEVICE_REVOKED";
      case ERROR_CODE_DRM_LICENSE_EXPIRED:
        return "ERROR_CODE_DRM_LICENSE_EXPIRED";
-      case ERROR_CODE_FRAME_PROCESSOR_INIT_FAILED:
+      case ERROR_CODE_VIDEO_FRAME_PROCESSOR_INIT_FAILED:
-        return "ERROR_CODE_FRAME_PROCESSOR_INIT_FAILED";
+        return "ERROR_CODE_VIDEO_FRAME_PROCESSOR_INIT_FAILED";
-      case ERROR_CODE_FRAME_PROCESSING_FAILED:
+      case ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED:
-        return "ERROR_CODE_FRAME_PROCESSING_FAILED";
+        return "ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED";
      default:
        if (errorCode >= CUSTOM_ERROR_CODE_BASE) {
          return "custom error code";

--- a/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java
@@ -21,25 +21,26 @@ import com.google.android.exoplayer2.C;
 * Thrown when an exception occurs while preparing an {@link Effect}, or applying an {@link Effect}
 * to video frames.
 */
-public final class FrameProcessingException extends Exception {
+public final class VideoFrameProcessingException extends Exception {
  /**
-   * Wraps the given exception in a {@code FrameProcessingException} if it is not already a {@code
+   * Wraps the given exception in a {@code VideoFrameProcessingException} if it is not already a
-   * FrameProcessingException} and returns the exception otherwise.
+   * {@code VideoFrameProcessingException} and returns the exception otherwise.
   */
-  public static FrameProcessingException from(Exception exception) {
+  public static VideoFrameProcessingException from(Exception exception) {
    return from(exception, /* presentationTimeUs= */ C.TIME_UNSET);
  }
  /**
-   * Wraps the given exception in a {@code FrameProcessingException} with the given timestamp if it
+   * Wraps the given exception in a {@code VideoFrameProcessingException} with the given timestamp
-   * is not already a {@code FrameProcessingException} and returns the exception otherwise.
+   * if it is not already a {@code VideoFrameProcessingException} and returns the exception
+   * otherwise.
   */
-  public static FrameProcessingException from(Exception exception, long presentationTimeUs) {
+  public static VideoFrameProcessingException from(Exception exception, long presentationTimeUs) {
-    if (exception instanceof FrameProcessingException) {
+    if (exception instanceof VideoFrameProcessingException) {
-      return (FrameProcessingException) exception;
+      return (VideoFrameProcessingException) exception;
    } else {
-      return new FrameProcessingException(exception, presentationTimeUs);
+      return new VideoFrameProcessingException(exception, presentationTimeUs);
    }
  }
@@ -54,7 +55,7 @@ public final class FrameProcessingException extends Exception {
   *
   * @param message The detail message for this exception.
   */
-  public FrameProcessingException(String message) {
+  public VideoFrameProcessingException(String message) {
    this(message, /* presentationTimeUs= */ C.TIME_UNSET);
  }
@@ -64,7 +65,7 @@ public final class FrameProcessingException extends Exception {
   * @param message The detail message for this exception.
   * @param presentationTimeUs The timestamp of the frame for which the exception occurred.
   */
-  public FrameProcessingException(String message, long presentationTimeUs) {
+  public VideoFrameProcessingException(String message, long presentationTimeUs) {
    super(message);
    this.presentationTimeUs = presentationTimeUs;
  }
@@ -75,7 +76,7 @@ public final class FrameProcessingException extends Exception {
   * @param message The detail message for this exception.
   * @param cause The cause of this exception.
   */
-  public FrameProcessingException(String message, Throwable cause) {
+  public VideoFrameProcessingException(String message, Throwable cause) {
    this(message, cause, /* presentationTimeUs= */ C.TIME_UNSET);
  }
@@ -86,7 +87,7 @@ public final class FrameProcessingException extends Exception {
   * @param cause The cause of this exception.
   * @param presentationTimeUs The timestamp of the frame for which the exception occurred.
   */
-  public FrameProcessingException(String message, Throwable cause, long presentationTimeUs) {
+  public VideoFrameProcessingException(String message, Throwable cause, long presentationTimeUs) {
    super(message, cause);
    this.presentationTimeUs = presentationTimeUs;
  }
@@ -96,7 +97,7 @@ public final class FrameProcessingException extends Exception {
   *
   * @param cause The cause of this exception.
   */
-  public FrameProcessingException(Throwable cause) {
+  public VideoFrameProcessingException(Throwable cause) {
    this(cause, /* presentationTimeUs= */ C.TIME_UNSET);
  }
@@ -106,7 +107,7 @@ public final class FrameProcessingException extends Exception {
   * @param cause The cause of this exception.
   * @param presentationTimeUs The timestamp of the frame for which the exception occurred.
   */
-  public FrameProcessingException(Throwable cause, long presentationTimeUs) {
+  public VideoFrameProcessingException(Throwable cause, long presentationTimeUs) {
    super(cause);
    this.presentationTimeUs = presentationTimeUs;
  }

--- a/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.concurrent.Executor;
 /**
- * Interface for a frame processor that applies changes to individual video frames.
+ * Interface for a video frame processor that applies changes to individual video frames.
 *
 * <p>The changes are specified by {@link Effect} instances passed to {@link Factory#create}.
 *
@@ -36,13 +36,13 @@ import java.util.concurrent.Executor;
 * <p>The caller must {@linkplain #registerInputFrame() register} input frames before rendering them
 * to the input {@link Surface}.
 */
-public interface FrameProcessor {
+public interface VideoFrameProcessor {
  // TODO(b/243036513): Allow effects to be replaced.
-  /** A factory for {@link FrameProcessor} instances. */
+  /** A factory for {@link VideoFrameProcessor} instances. */
  interface Factory {
    /**
-     * Creates a new {@link FrameProcessor} instance.
+     * Creates a new {@link VideoFrameProcessor} instance.
     *
     * @param context A {@link Context}.
     * @param effects The {@link Effect} instances to apply to each frame. Applied on the {@code
@@ -54,18 +54,18 @@ public interface FrameProcessor {
     *     video) or not (e.g. from a {@link Bitmap}). See <a
     *     href="https://source.android.com/docs/core/graphics/arch-st#ext_texture">the
     *     SurfaceTexture docs</a> for more information on external textures.
-     * @param releaseFramesAutomatically If {@code true}, the {@link FrameProcessor} will render
+     * @param releaseFramesAutomatically If {@code true}, the instance will render output frames to
-     *     output frames to the {@linkplain #setOutputSurfaceInfo(SurfaceInfo) output surface}
+     *     the {@linkplain #setOutputSurfaceInfo(SurfaceInfo) output surface} automatically as
-     *     automatically as {@link FrameProcessor} is done processing them. If {@code false}, the
+     *     {@link VideoFrameProcessor} is done processing them. If {@code false}, the {@link
-     *     {@link FrameProcessor} will block until {@link #releaseOutputFrame(long)} is called, to
+     *     VideoFrameProcessor} will block until {@link #releaseOutputFrame(long)} is called, to
     *     render or drop the frame.
     * @param executor The {@link Executor} on which the {@code listener} is invoked.
     * @param listener A {@link Listener}.
     * @return A new instance.
-     * @throws FrameProcessingException If a problem occurs while creating the {@link
+     * @throws VideoFrameProcessingException If a problem occurs while creating the {@link
-     *     FrameProcessor}.
+     *     VideoFrameProcessor}.
     */
-    FrameProcessor create(
+    VideoFrameProcessor create(
        Context context,
        List<Effect> effects,
        DebugViewProvider debugViewProvider,
@@ -75,7 +75,7 @@ public interface FrameProcessor {
        boolean releaseFramesAutomatically,
        Executor executor,
        Listener listener)
-        throws FrameProcessingException;
+        throws VideoFrameProcessingException;
  }
  /**
@@ -105,15 +105,15 @@ public interface FrameProcessor {
    void onOutputFrameAvailable(long presentationTimeUs);
    /**
-     * Called when an exception occurs during asynchronous frame processing.
+     * Called when an exception occurs during asynchronous video frame processing.
     *
     * <p>If an error occurred, consuming and producing further frames will not work as expected and
-     * the {@link FrameProcessor} should be released.
+     * the {@link VideoFrameProcessor} should be released.
     */
-    void onFrameProcessingError(FrameProcessingException exception);
+    void onError(VideoFrameProcessingException exception);
-    /** Called after the {@link FrameProcessor} has produced its final output frame. */
+    /** Called after the {@link VideoFrameProcessor} has produced its final output frame. */
-    void onFrameProcessingEnded();
+    void onEnded();
  }
  /**
@@ -126,14 +126,14 @@ public interface FrameProcessor {
  long DROP_OUTPUT_FRAME = -2;
  /**
-   * Provides an input {@link Bitmap} to the {@link FrameProcessor}.
+   * Provides an input {@link Bitmap} to the {@code VideoFrameProcessor}.
   *
-   * <p>This method should only be used for when the {@link FrameProcessor}'s {@code
+   * <p>This method should only be used for when the {@code VideoFrameProcessor}'s {@code
   * isInputTextureExternal} parameter is set to {@code false}.
   *
   * <p>Can be called on any thread.
   *
-   * @param inputBitmap The {@link Bitmap} queued to the {@link FrameProcessor}.
+   * @param inputBitmap The {@link Bitmap} queued to the {@code VideoFrameProcessor}.
   * @param durationUs The duration for which to display the {@code inputBitmap}, in microseconds.
   * @param frameRate The frame rate at which to display the {@code inputBitmap}, in frames per
   *     second.
@@ -143,9 +143,10 @@ public interface FrameProcessor {
  void queueInputBitmap(Bitmap inputBitmap, long durationUs, float frameRate);
  /**
-   * Returns the input {@link Surface}, where {@link FrameProcessor} consumes input frames from.
+   * Returns the input {@link Surface}, where {@code VideoFrameProcessor} consumes input frames
+   * from.
   *
-   * <p>This method should only be used for when the {@link FrameProcessor}'s {@code
+   * <p>This method should only be used for when the {@code VideoFrameProcessor}'s {@code
   * isInputTextureExternal} parameter is set to {@code true}.
   *
   * <p>Can be called on any thread.
@@ -170,11 +171,11 @@ public interface FrameProcessor {
  void setInputFrameInfo(FrameInfo inputFrameInfo);
  /**
-   * Informs the {@code FrameProcessor} that a frame will be queued to its input surface.
+   * Informs the {@code VideoFrameProcessor} that a frame will be queued to its input surface.
   *
-   * <p>Must be called before rendering a frame to the frame processor's input surface.
+   * <p>Must be called before rendering a frame to the {@code VideoFrameProcessor}'s input surface.
   *
-   * <p>This method should only be used for when the {@link FrameProcessor}'s {@code
+   * <p>This method should only be used for when the {@code VideoFrameProcessor}'s {@code
   * isInputTextureExternal} parameter is set to {@code true}.
   *
   * <p>Can be called on any thread.
@@ -188,7 +189,7 @@ public interface FrameProcessor {
   * Returns the number of input frames that have been {@linkplain #registerInputFrame() registered}
   * but not processed off the {@linkplain #getInputSurface() input surface} yet.
   *
-   * <p>This method should only be used for when the {@link FrameProcessor}'s {@code
+   * <p>This method should only be used for when the {@code VideoFrameProcessor}'s {@code
   * isInputTextureExternal} parameter is set to {@code true}.
   *
   * <p>Can be called on any thread.
@@ -200,7 +201,7 @@ public interface FrameProcessor {
   * dropped, they will be rendered to this output {@link SurfaceInfo}.
   *
   * <p>The new output {@link SurfaceInfo} is applied from the next output frame rendered onwards.
-   * If the output {@link SurfaceInfo} is {@code null}, the {@code FrameProcessor} will stop
+   * If the output {@link SurfaceInfo} is {@code null}, the {@code VideoFrameProcessor} will stop
   * rendering pending frames and resume rendering once a non-null {@link SurfaceInfo} is set.
   *
   * <p>If the dimensions given in {@link SurfaceInfo} do not match the {@linkplain
@@ -234,7 +235,7 @@ public interface FrameProcessor {
  void releaseOutputFrame(long releaseTimeNs);
  /**
-   * Informs the {@code FrameProcessor} that no further input frames should be accepted.
+   * Informs the {@code VideoFrameProcessor} that no further input frames should be accepted.
   *
   * <p>Can be called on any thread.
   *
@@ -243,12 +244,12 @@ public interface FrameProcessor {
  void signalEndOfInput();
  /**
-   * Flushes the {@code FrameProcessor}.
+   * Flushes the {@code VideoFrameProcessor}.
   *
   * <p>All the frames that are {@linkplain #registerInputFrame() registered} prior to calling this
   * method are no longer considered to be registered when this method returns.
   *
-   * <p>This method should only be used for when the {@link FrameProcessor}'s {@code
+   * <p>This method should only be used for when the {@code VideoFrameProcessor}'s {@code
   * isInputTextureExternal} parameter is set to {@code true}.
   *
   * <p>{@link Listener} methods invoked prior to calling this method should be ignored.
@@ -258,10 +259,9 @@ public interface FrameProcessor {
  /**
   * Releases all resources.
   *
-   * <p>If the frame processor is released before it has {@linkplain
+   * <p>If the {@code VideoFrameProcessor} is released before it has {@linkplain Listener#onEnded()
-   * Listener#onFrameProcessingEnded() ended}, it will attempt to cancel processing any input frames
+   * ended}, it will attempt to cancel processing any input frames that have already become
-   * that have already become available. Input frames that become available after release are
+   * available. Input frames that become available after release are ignored.
-   * ignored.
   *
   * <p>This method blocks until all resources are released or releasing times out.
   *

--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java
@@ -35,9 +35,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
 import org.junit.Before;
@@ -50,7 +50,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public class ContrastPixelTest {
@@ -89,7 +89,7 @@ public class ContrastPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (contrastShaderProgram != null) {
      contrastShaderProgram.release();
    }
@@ -198,7 +198,7 @@ public class ContrastPixelTest {
    assertThat(averagePixelAbsoluteDifference).isAtMost(MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE);
  }
-  private void setupOutputTexture(int outputWidth, int outputHeight) throws GlUtil.GlException {
+  private void setupOutputTexture(int outputWidth, int outputHeight) throws Exception {
    int outputTexId =
        GlUtil.createTexture(
            outputWidth, outputHeight, /* useHighPrecisionColorComponents= */ false);

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java
@@ -32,9 +32,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
@@ -48,7 +48,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class CropPixelTest {
@@ -82,7 +82,7 @@ public final class CropPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (cropShaderProgram != null) {
      cropShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java
--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorFrameReleaseTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorFrameReleaseTest.java
--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java
@@ -34,9 +34,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
@@ -50,7 +50,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class HslAdjustmentPixelTest {
@@ -100,7 +100,7 @@ public final class HslAdjustmentPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (hslProcessor != null) {
      hslProcessor.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixShaderProgramPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixShaderProgramPixelTest.java
@@ -32,8 +32,8 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
@@ -47,7 +47,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class MatrixShaderProgramPixelTest {
@@ -87,7 +87,7 @@ public final class MatrixShaderProgramPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (matrixShaderProgram != null) {
      matrixShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/OverlayShaderProgramPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/OverlayShaderProgramPixelTest.java
@@ -37,9 +37,9 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -54,7 +54,7 @@ import org.junit.runner.RunWith;
 * <p>Expected bitmaps are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public class OverlayShaderProgramPixelTest {
@@ -101,7 +101,7 @@ public class OverlayShaderProgramPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (overlayShaderProgram != null) {
      overlayShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java
@@ -33,9 +33,9 @@ import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class PresentationPixelTest {
@@ -91,7 +91,7 @@ public final class PresentationPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (presentationShaderProgram != null) {
      presentationShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java
@@ -35,9 +35,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -52,7 +52,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class RgbAdjustmentPixelTest {
@@ -99,7 +99,7 @@ public final class RgbAdjustmentPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (matrixShaderProgram != null) {
      matrixShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java
@@ -33,9 +33,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public final class RgbFilterPixelTest {
@@ -94,7 +94,7 @@ public final class RgbFilterPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (matrixShaderProgram != null) {
      matrixShaderProgram.release();
    }

--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java
@@ -34,9 +34,9 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.BitmapPixelTestUtil;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;
 import org.junit.Before;
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith;
 * <p>Expected images are taken from an emulator, so tests on different emulators or physical
 * devices may fail. To test on other devices, please increase the {@link
 * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output
- * bitmaps as recommended in {@link GlEffectsFrameProcessorPixelTest}.
+ * bitmaps as recommended in {@link DefaultVideoFrameProcessorPixelTest}.
 */
 @RunWith(AndroidJUnit4.class)
 public class SingleColorLutPixelTest {
@@ -88,7 +88,7 @@ public class SingleColorLutPixelTest {
  }
  @After
-  public void release() throws GlUtil.GlException, FrameProcessingException {
+  public void release() throws GlUtil.GlException, VideoFrameProcessingException {
    if (colorLutShaderProgram != null) {
      colorLutShaderProgram.release();
    }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
@@ -22,9 +22,9 @@ import android.net.Uri;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import com.google.android.exoplayer2.util.BitmapLoader;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ExecutionException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -42,9 +42,9 @@ public abstract class BitmapOverlay extends TextureOverlay {
   * Returns the overlay bitmap displayed at the specified timestamp.
   *
   * @param presentationTimeUs The presentation timestamp of the current frame, in microseconds.
-   * @throws FrameProcessingException If an error occurs while processing or drawing the frame.
+   * @throws VideoFrameProcessingException If an error occurs while processing or drawing the frame.
   */
-  public abstract Bitmap getBitmap(long presentationTimeUs) throws FrameProcessingException;
+  public abstract Bitmap getBitmap(long presentationTimeUs) throws VideoFrameProcessingException;
  /**
   * {@inheritDoc}
@@ -59,7 +59,7 @@ public abstract class BitmapOverlay extends TextureOverlay {
  }
  @Override
-  public int getTextureId(long presentationTimeUs) throws FrameProcessingException {
+  public int getTextureId(long presentationTimeUs) throws VideoFrameProcessingException {
    Bitmap bitmap = getBitmap(presentationTimeUs);
    if (bitmap != lastBitmap) {
      try {
@@ -77,7 +77,7 @@ public abstract class BitmapOverlay extends TextureOverlay {
            /* border= */ 0);
        GlUtil.checkGlError();
      } catch (GlUtil.GlException e) {
-        throw new FrameProcessingException(e);
+        throw new VideoFrameProcessingException(e);
      }
    }
    return lastTextureId;
@@ -132,14 +132,14 @@ public abstract class BitmapOverlay extends TextureOverlay {
      private @MonotonicNonNull Bitmap lastBitmap;
      @Override
-      public Bitmap getBitmap(long presentationTimeUs) throws FrameProcessingException {
+      public Bitmap getBitmap(long presentationTimeUs) throws VideoFrameProcessingException {
        if (lastBitmap == null) {
          BitmapLoader bitmapLoader = new SimpleBitmapLoader();
          ListenableFuture<Bitmap> future = bitmapLoader.loadBitmap(overlayBitmapUri);
          try {
            lastBitmap = future.get();
          } catch (ExecutionException | InterruptedException e) {
-            throw new FrameProcessingException(e);
+            throw new VideoFrameProcessingException(e);
          }
        }
        return lastBitmap;

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlShaderProgramListener.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlShaderProgramListener.java
@@ -35,7 +35,7 @@ import java.util.Queue;
  private final GlShaderProgram producingGlShaderProgram;
  private final GlShaderProgram consumingGlShaderProgram;
-  private final FrameProcessingTaskExecutor frameProcessingTaskExecutor;
+  private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;
  @GuardedBy("this")
  private final Queue<Pair<TextureInfo, Long>> availableFrames;
@@ -50,18 +50,18 @@ import java.util.Queue;
   *     as {@link OutputListener}.
   * @param consumingGlShaderProgram The {@link GlShaderProgram} for which this listener will be set
   *     as {@link InputListener}.
-   * @param frameProcessingTaskExecutor The {@link FrameProcessingTaskExecutor} that is used for
+   * @param videoFrameProcessingTaskExecutor The {@link VideoFrameProcessingTaskExecutor} that is
-   *     OpenGL calls. All calls to the producing/consuming {@link GlShaderProgram} will be executed
+   *     used for OpenGL calls. All calls to the producing/consuming {@link GlShaderProgram} will be
-   *     by the {@link FrameProcessingTaskExecutor}. The caller is responsible for releasing the
+   *     executed by the {@link VideoFrameProcessingTaskExecutor}. The caller is responsible for
-   *     {@link FrameProcessingTaskExecutor}.
+   *     releasing the {@link VideoFrameProcessingTaskExecutor}.
   */
  public ChainingGlShaderProgramListener(
      GlShaderProgram producingGlShaderProgram,
      GlShaderProgram consumingGlShaderProgram,
-      FrameProcessingTaskExecutor frameProcessingTaskExecutor) {
+      VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor) {
    this.producingGlShaderProgram = producingGlShaderProgram;
    this.consumingGlShaderProgram = consumingGlShaderProgram;
-    this.frameProcessingTaskExecutor = frameProcessingTaskExecutor;
+    this.videoFrameProcessingTaskExecutor = videoFrameProcessingTaskExecutor;
    availableFrames = new ArrayDeque<>();
  }
@@ -75,9 +75,10 @@ import java.util.Queue;
    long presentationTimeUs = pendingFrame.second;
    if (presentationTimeUs == C.TIME_END_OF_SOURCE) {
-      frameProcessingTaskExecutor.submit(consumingGlShaderProgram::signalEndOfCurrentInputStream);
+      videoFrameProcessingTaskExecutor.submit(
+          consumingGlShaderProgram::signalEndOfCurrentInputStream);
    } else {
-      frameProcessingTaskExecutor.submit(
+      videoFrameProcessingTaskExecutor.submit(
          () ->
              consumingGlShaderProgram.queueInputFrame(
                  /* inputTexture= */ pendingFrame.first, presentationTimeUs));
@@ -86,7 +87,7 @@ import java.util.Queue;
  @Override
  public void onInputFrameProcessed(TextureInfo inputTexture) {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> producingGlShaderProgram.releaseOutputFrame(inputTexture));
  }
@@ -94,14 +95,14 @@ import java.util.Queue;
  public synchronized void onFlush() {
    consumingGlShaderProgramInputCapacity = 0;
    availableFrames.clear();
-    frameProcessingTaskExecutor.submit(producingGlShaderProgram::flush);
+    videoFrameProcessingTaskExecutor.submit(producingGlShaderProgram::flush);
  }
  @Override
  public synchronized void onOutputFrameAvailable(
      TextureInfo outputTexture, long presentationTimeUs) {
    if (consumingGlShaderProgramInputCapacity > 0) {
-      frameProcessingTaskExecutor.submit(
+      videoFrameProcessingTaskExecutor.submit(
          () ->
              consumingGlShaderProgram.queueInputFrame(
                  /* inputTexture= */ outputTexture, presentationTimeUs));
@@ -116,7 +117,8 @@ import java.util.Queue;
    if (!availableFrames.isEmpty()) {
      availableFrames.add(new Pair<>(TextureInfo.UNSET, C.TIME_END_OF_SOURCE));
    } else {
-      frameProcessingTaskExecutor.submit(consumingGlShaderProgram::signalEndOfCurrentInputStream);
+      videoFrameProcessingTaskExecutor.submit(
+          consumingGlShaderProgram::signalEndOfCurrentInputStream);
    }
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.effect;
 import android.content.Context;
 import androidx.annotation.WorkerThread;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /**
 * Specifies color transformations using color lookup tables to apply to each frame in the fragment
@@ -43,7 +43,7 @@ public interface ColorLut extends GlEffect {
  @Override
  @WorkerThread
  default SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return new ColorLutShaderProgram(context, /* colorLut= */ this, useHdr);
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutShaderProgram.java
@@ -20,10 +20,10 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
 import android.opengl.GLES20;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 /** Applies a {@link ColorLut} to each frame in the fragment shader. */
@@ -41,10 +41,10 @@ import java.io.IOException;
   * @param colorLut The {@link ColorLut} to apply to each frame in order.
   * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
   *     in linear RGB BT.2020. If {@code false}, colors will be in linear RGB BT.709.
-   * @throws FrameProcessingException If a problem occurs while reading shader files.
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files.
   */
  public ColorLutShaderProgram(Context context, ColorLut colorLut, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    super(useHdr);
    // TODO(b/246315245): Add HDR support.
    checkArgument(!useHdr, "ColorLutShaderProgram does not support HDR colors.");
@@ -53,7 +53,7 @@ import java.io.IOException;
    try {
      glProgram = new GlProgram(context, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH);
    } catch (IOException | GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    // Draw the frame on the entire normalized device coordinate space, from -1 to 1, for x and y.
@@ -73,7 +73,8 @@ import java.io.IOException;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    try {
      glProgram.use();
      glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0);
@@ -84,18 +85,18 @@ import java.io.IOException;
      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    super.release();
    try {
      colorLut.release();
      glProgram.delete();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java
@@ -19,7 +19,7 @@ package com.google.android.exoplayer2.effect;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /** A {@link GlEffect} to control the contrast of video frames. */
 public class Contrast implements GlEffect {
@@ -40,7 +40,7 @@ public class Contrast implements GlEffect {
  @Override
  public SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return new ContrastShaderProgram(context, this, useHdr);
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ContrastShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ContrastShaderProgram.java
@@ -18,10 +18,10 @@ package com.google.android.exoplayer2.effect;
 import android.content.Context;
 import android.opengl.GLES20;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 /** Applies a {@link Contrast} to each frame in the fragment shader. */
@@ -38,10 +38,10 @@ import java.io.IOException;
   * @param contrastEffect The {@link Contrast} to apply to each frame in order.
   * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
   *     in linear RGB BT.2020. If {@code false}, colors will be in linear RGB BT.709.
-   * @throws FrameProcessingException If a problem occurs while reading shader files.
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files.
   */
  public ContrastShaderProgram(Context context, Contrast contrastEffect, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    super(useHdr);
    // Use 1.0001f to avoid division by zero issues.
    float contrastFactor = (1 + contrastEffect.contrast) / (1.0001f - contrastEffect.contrast);
@@ -49,7 +49,7 @@ import java.io.IOException;
    try {
      glProgram = new GlProgram(context, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH);
    } catch (IOException | GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    // Draw the frame on the entire normalized device coordinate space, from -1 to 1, for x and y.
@@ -70,7 +70,8 @@ import java.io.IOException;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    try {
      glProgram.use();
      glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0);
@@ -79,17 +80,17 @@ import java.io.IOException;
      // The four-vertex triangle strip forms a quad.
      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e, presentationTimeUs);
+      throw new VideoFrameProcessingException(e, presentationTimeUs);
    }
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    super.release();
    try {
      glProgram.delete();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessor.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessor.java
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java
@@ -24,9 +24,9 @@ import androidx.annotation.WorkerThread;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.effect.GlShaderProgram.InputListener;
 import com.google.android.exoplayer2.util.FrameInfo;
-import com.google.android.exoplayer2.util.FrameProcessingException;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 */
 /* package */ final class ExternalTextureManager implements InputListener {
-  private final FrameProcessingTaskExecutor frameProcessingTaskExecutor;
+  private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;
  private final ExternalShaderProgram externalShaderProgram;
  private final int externalTexId;
  private final Surface surface;
@@ -61,7 +61,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  @Nullable private volatile FrameInfo currentFrame;
  // TODO(b/238302341) Remove the use of after flush task, block the calling thread instead.
-  @Nullable private volatile FrameProcessingTask onFlushCompleteTask;
+  @Nullable private volatile VideoFrameProcessingTask onFlushCompleteTask;
  private long previousStreamOffsetUs;
@@ -70,21 +70,21 @@ import java.util.concurrent.atomic.AtomicInteger;
   *
   * @param externalShaderProgram The {@link ExternalShaderProgram} for which this {@code
   *     ExternalTextureManager} will be set as the {@link InputListener}.
-   * @param frameProcessingTaskExecutor The {@link FrameProcessingTaskExecutor}.
+   * @param videoFrameProcessingTaskExecutor The {@link VideoFrameProcessingTaskExecutor}.
-   * @throws FrameProcessingException If a problem occurs while creating the external texture.
+   * @throws VideoFrameProcessingException If a problem occurs while creating the external texture.
   */
  // The onFrameAvailableListener will not be invoked until the constructor returns.
  @SuppressWarnings("nullness:method.invocation.invalid")
  public ExternalTextureManager(
      ExternalShaderProgram externalShaderProgram,
-      FrameProcessingTaskExecutor frameProcessingTaskExecutor)
+      VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    this.externalShaderProgram = externalShaderProgram;
-    this.frameProcessingTaskExecutor = frameProcessingTaskExecutor;
+    this.videoFrameProcessingTaskExecutor = videoFrameProcessingTaskExecutor;
    try {
      externalTexId = GlUtil.createExternalTexture();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    surfaceTexture = new SurfaceTexture(externalTexId);
    textureTransformMatrix = new float[16];
@@ -93,7 +93,7 @@ import java.util.concurrent.atomic.AtomicInteger;
    previousStreamOffsetUs = C.TIME_UNSET;
    surfaceTexture.setOnFrameAvailableListener(
        unused ->
-            frameProcessingTaskExecutor.submit(
+            videoFrameProcessingTaskExecutor.submit(
                () -> {
                  if (numberOfFramesToDropOnBecomingAvailable > 0) {
                    numberOfFramesToDropOnBecomingAvailable--;
@@ -119,7 +119,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  @Override
  public void onReadyToAcceptInputFrame() {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> {
          externalShaderProgramInputCapacity.incrementAndGet();
          maybeQueueFrameToExternalShaderProgram();
@@ -128,7 +128,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  @Override
  public void onInputFrameProcessed(TextureInfo inputTexture) {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> {
          currentFrame = null;
          maybeQueueFrameToExternalShaderProgram();
@@ -136,13 +136,13 @@ import java.util.concurrent.atomic.AtomicInteger;
  }
  /** Sets the task to run on completing flushing, or {@code null} to clear any task. */
-  public void setOnFlushCompleteListener(@Nullable FrameProcessingTask task) {
+  public void setOnFlushCompleteListener(@Nullable VideoFrameProcessingTask task) {
    onFlushCompleteTask = task;
  }
  @Override
  public void onFlush() {
-    frameProcessingTaskExecutor.submit(this::flush);
+    videoFrameProcessingTaskExecutor.submit(this::flush);
  }
  /**
@@ -169,10 +169,10 @@ import java.util.concurrent.atomic.AtomicInteger;
  /**
   * Signals the end of the input.
   *
-   * @see FrameProcessor#signalEndOfInput()
+   * @see VideoFrameProcessor#signalEndOfInput()
   */
  public void signalEndOfInput() {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> {
          inputStreamEnded = true;
          if (pendingFrames.isEmpty() && currentFrame == null) {
@@ -204,7 +204,7 @@ import java.util.concurrent.atomic.AtomicInteger;
    if (onFlushCompleteTask == null || numberOfFramesToDropOnBecomingAvailable > 0) {
      return;
    }
-    frameProcessingTaskExecutor.submitWithHighPriority(onFlushCompleteTask);
+    videoFrameProcessingTaskExecutor.submitWithHighPriority(onFlushCompleteTask);
  }
  @WorkerThread

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalMatrixShaderProgramWrapper.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalMatrixShaderProgramWrapper.java
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameCache.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameCache.java
@@ -19,13 +19,13 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
 import androidx.annotation.IntRange;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /**
 * Caches the input frames.
 *
 * <p>Example usage: cache the processed frames when presenting them on screen, to accommodate for
- * the possible fluctuation in frame processing time between frames.
+ * the possible fluctuation in video frame processing time between frames.
 */
 public final class FrameCache implements GlEffect {
  /** The capacity of the frame cache. */
@@ -49,7 +49,7 @@ public final class FrameCache implements GlEffect {
  @Override
  public GlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return new FrameCacheShaderProgram(context, capacity, useHdr);
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameCacheShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameCacheShaderProgram.java
@@ -19,9 +19,9 @@ import static com.google.android.exoplayer2.util.Assertions.checkState;
 import android.content.Context;
 import android.opengl.GLES20;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.io.IOException;
@@ -54,7 +54,7 @@ import java.util.concurrent.Executor;
  /** Creates a new instance. */
  public FrameCacheShaderProgram(Context context, int capacity, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    freeOutputTextures = new ArrayDeque<>();
    inUseOutputTextures = new ArrayDeque<>();
    try {
@@ -64,7 +64,7 @@ import java.util.concurrent.Executor;
              VERTEX_SHADER_TRANSFORMATION_ES2_PATH,
              FRAGMENT_SHADER_TRANSFORMATION_ES2_PATH);
    } catch (IOException | GlUtil.GlException e) {
-      throw FrameProcessingException.from(e);
+      throw VideoFrameProcessingException.from(e);
    }
    this.capacity = capacity;
    this.useHdr = useHdr;
@@ -80,7 +80,7 @@ import java.util.concurrent.Executor;
    inputListener = new InputListener() {};
    outputListener = new OutputListener() {};
-    errorListener = frameProcessingException -> {};
+    errorListener = videoFrameProcessingException -> {};
    errorListenerExecutor = MoreExecutors.directExecutor();
  }
@@ -129,7 +129,7 @@ import java.util.concurrent.Executor;
      outputListener.onOutputFrameAvailable(outputTexture, presentationTimeUs);
    } catch (GlUtil.GlException | NoSuchElementException e) {
      errorListenerExecutor.execute(
-          () -> errorListener.onFrameProcessingError(FrameProcessingException.from(e)));
+          () -> errorListener.onError(VideoFrameProcessingException.from(e)));
    }
  }
@@ -167,11 +167,11 @@ import java.util.concurrent.Executor;
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    try {
      deleteAllOutputTextures();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffect.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffect.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.effect;
 import android.content.Context;
 import com.google.android.exoplayer2.util.Effect;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /**
 * Interface for a video frame effect with a {@link GlShaderProgram} implementation.
@@ -34,10 +34,11 @@ public interface GlEffect extends Effect {
   * @param context A {@link Context}.
   * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
   *     in linear RGB BT.2020. If {@code false}, colors will be in linear RGB BT.709.
-   * @throws FrameProcessingException If an error occurs while creating the {@link GlShaderProgram}.
+   * @throws VideoFrameProcessingException If an error occurs while creating the {@link
+   *     GlShaderProgram}.
   */
  GlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException;
+      throws VideoFrameProcessingException;
  /**
   * Returns whether a {@link GlEffect} applies no change at every timestamp.

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlMatrixTransformation.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlMatrixTransformation.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.effect;
 import android.content.Context;
 import android.opengl.Matrix;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 /**
@@ -52,7 +52,7 @@ public interface GlMatrixTransformation extends GlEffect {
  @Override
  default SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return MatrixShaderProgram.create(
        context,
        /* matrixTransformations= */ ImmutableList.of(this),

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlShaderProgram.java
@@ -15,7 +15,7 @@
 */
 package com.google.android.exoplayer2.effect;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.util.concurrent.Executor;
 /**
@@ -45,7 +45,7 @@ import java.util.concurrent.Executor;
 public interface GlShaderProgram {
  /**
-   * Listener for input-related frame processing events.
+   * Listener for input-related video frame processing events.
   *
   * <p>This listener can be called from any thread.
   */
@@ -79,7 +79,7 @@ public interface GlShaderProgram {
  }
  /**
-   * Listener for output-related frame processing events.
+   * Listener for output-related video frame processing events.
   *
   * <p>This listener can be called from any thread.
   */
@@ -106,26 +106,26 @@ public interface GlShaderProgram {
  }
  /**
-   * Listener for frame processing errors.
+   * Listener for video frame processing errors.
   *
   * <p>This listener can be called from any thread.
   */
  interface ErrorListener {
    /**
-     * Called when an exception occurs during asynchronous frame processing.
+     * Called when an exception occurs during asynchronous video frame processing.
     *
     * <p>If an error occurred, consuming and producing further frames will not work as expected and
     * the {@link GlShaderProgram} should be released.
     */
-    void onFrameProcessingError(FrameProcessingException e);
+    void onError(VideoFrameProcessingException e);
  }
  /**
   * Sets the {@link InputListener}.
   *
   * <p>The {@link InputListener} should be invoked on the thread that owns the parent OpenGL
-   * context. For example, {@link GlEffectsFrameProcessor} invokes the {@link InputListener} methods
+   * context. For example, {@link DefaultVideoFrameProcessor} invokes the {@link InputListener}
-   * on its internal thread.
+   * methods on its internal thread.
   */
  void setInputListener(InputListener inputListener);
@@ -133,7 +133,7 @@ public interface GlShaderProgram {
   * Sets the {@link OutputListener}.
   *
   * <p>The {@link OutputListener} should be invoked on the thread that owns the parent OpenGL
-   * context. For example, {@link GlEffectsFrameProcessor} invokes the {@link OutputListener}
+   * context. For example, {@link DefaultVideoFrameProcessor} invokes the {@link OutputListener}
   * methods on its internal thread.
   */
  void setOutputListener(OutputListener outputListener);
@@ -188,7 +188,7 @@ public interface GlShaderProgram {
  /**
   * Releases all resources.
   *
-   * @throws FrameProcessingException If an error occurs while releasing resources.
+   * @throws VideoFrameProcessingException If an error occurs while releasing resources.
   */
-  void release() throws FrameProcessingException;
+  void release() throws VideoFrameProcessingException;
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
@@ -19,7 +19,7 @@ package com.google.android.exoplayer2.effect;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 /** Adjusts the HSL (Hue, Saturation, and Lightness) of a frame. */
@@ -112,7 +112,7 @@ public class HslAdjustment implements GlEffect {
  @Override
  public SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return new HslShaderProgram(context, /* hslAdjustment= */ this, useHdr);
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslShaderProgram.java
@@ -20,10 +20,10 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
 import android.opengl.GLES20;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import java.io.IOException;
 /** Applies the {@link HslAdjustment} to each frame in the fragment shader. */
@@ -40,10 +40,10 @@ import java.io.IOException;
   * @param hslAdjustment The {@link HslAdjustment} to apply to each frame in order.
   * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
   *     in linear RGB BT.2020. If {@code false}, colors will be in linear RGB BT.709.
-   * @throws FrameProcessingException If a problem occurs while reading shader files.
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files.
   */
  public HslShaderProgram(Context context, HslAdjustment hslAdjustment, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    super(useHdr);
    // TODO(b/241241680): Check if HDR <-> HSL works the same or not.
    checkArgument(!useHdr, "HDR is not yet supported.");
@@ -51,7 +51,7 @@ import java.io.IOException;
    try {
      glProgram = new GlProgram(context, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH);
    } catch (IOException | GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    // Draw the frame on the entire normalized device coordinate space, from -1 to 1, for x and y.
@@ -78,7 +78,8 @@ import java.io.IOException;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    try {
      glProgram.use();
      glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0);
@@ -87,7 +88,7 @@ import java.io.IOException;
      // The four-vertex triangle strip forms a quad.
      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e, presentationTimeUs);
+      throw new VideoFrameProcessingException(e, presentationTimeUs);
    }
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/InternalTextureManager.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/InternalTextureManager.java
@@ -23,20 +23,21 @@ import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import androidx.annotation.WorkerThread;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.FrameProcessingException;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 /**
- * Forwards a frame produced from a {@link Bitmap} to a {@link GlShaderProgram} for consumption.
+ * Forwards a video frame produced from a {@link Bitmap} to a {@link GlShaderProgram} for
+ * consumption.
 *
 * <p>Methods in this class can be called from any thread.
 */
 /* package */ final class InternalTextureManager implements GlShaderProgram.InputListener {
  private final GlShaderProgram shaderProgram;
-  private final FrameProcessingTaskExecutor frameProcessingTaskExecutor;
+  private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;
  // The queue holds all bitmaps with one or more frames pending to be sent downstream.
  private final Queue<BitmapFrameSequenceInfo> pendingBitmaps;
@@ -51,13 +52,14 @@ import java.util.concurrent.LinkedBlockingQueue;
   *
   * @param shaderProgram The {@link GlShaderProgram} for which this {@code InternalTextureManager}
   *     will be set as the {@link GlShaderProgram.InputListener}.
-   * @param frameProcessingTaskExecutor The {@link FrameProcessingTaskExecutor} that the methods of
+   * @param videoFrameProcessingTaskExecutor The {@link VideoFrameProcessingTaskExecutor} that the
-   *     this class run on.
+   *     methods of this class run on.
   */
  public InternalTextureManager(
-      GlShaderProgram shaderProgram, FrameProcessingTaskExecutor frameProcessingTaskExecutor) {
+      GlShaderProgram shaderProgram,
+      VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor) {
    this.shaderProgram = shaderProgram;
-    this.frameProcessingTaskExecutor = frameProcessingTaskExecutor;
+    this.videoFrameProcessingTaskExecutor = videoFrameProcessingTaskExecutor;
    pendingBitmaps = new LinkedBlockingQueue<>();
  }
@@ -67,7 +69,7 @@ import java.util.concurrent.LinkedBlockingQueue;
    //    program and change to only allocate one texId at a time. A change to the
    //    onInputFrameProcessed() method signature to include presentationTimeUs will probably be
    //    needed to do this.
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> {
          downstreamShaderProgramCapacity++;
          maybeQueueToShaderProgram();
@@ -77,21 +79,21 @@ import java.util.concurrent.LinkedBlockingQueue;
  /**
   * Provides an input {@link Bitmap} to put into the video frames.
   *
-   * @see FrameProcessor#queueInputBitmap
+   * @see VideoFrameProcessor#queueInputBitmap
   */
  public void queueInputBitmap(
      Bitmap inputBitmap, long durationUs, float frameRate, boolean useHdr) {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> setupBitmap(inputBitmap, durationUs, frameRate, useHdr));
  }
  /**
   * Signals the end of the input.
   *
-   * @see FrameProcessor#signalEndOfInput()
+   * @see VideoFrameProcessor#signalEndOfInput()
   */
  public void signalEndOfInput() {
-    frameProcessingTaskExecutor.submit(
+    videoFrameProcessingTaskExecutor.submit(
        () -> {
          inputEnded = true;
          maybeSignalEndOfOutput();
@@ -100,7 +102,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  @WorkerThread
  private void setupBitmap(Bitmap bitmap, long durationUs, float frameRate, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    if (inputEnded) {
      return;
@@ -114,7 +116,7 @@ import java.util.concurrent.LinkedBlockingQueue;
      GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, /* level= */ 0, bitmap, /* border= */ 0);
      GlUtil.checkGlError();
    } catch (GlUtil.GlException e) {
-      throw FrameProcessingException.from(e);
+      throw VideoFrameProcessingException.from(e);
    }
    TextureInfo textureInfo =
        new TextureInfo(

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixShaderProgram.java
@@ -23,10 +23,10 @@ import android.opengl.GLES20;
 import android.opengl.Matrix;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -141,15 +141,15 @@ import java.util.List;
   * @param rgbMatrices The {@link RgbMatrix RgbMatrices} to apply to each frame in order. Can be
   *     empty to apply no color transformations.
   * @param useHdr Whether input and output colors are HDR.
-   * @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files or an
-   *     operation fails or is unsupported.
+   *     OpenGL operation fails or is unsupported.
   */
  public static MatrixShaderProgram create(
      Context context,
      List<GlMatrixTransformation> matrixTransformations,
      List<RgbMatrix> rgbMatrices,
      boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    GlProgram glProgram =
        createGlProgram(
            context, VERTEX_SHADER_TRANSFORMATION_PATH, FRAGMENT_SHADER_TRANSFORMATION_PATH);
@@ -183,8 +183,8 @@ import java.util.List;
   * @param outputColorInfo The output electrical (nonlinear) or optical (linear) {@link ColorInfo}.
   *     If this is an optical color, it must be BT.2020 if {@code inputColorInfo} is {@linkplain
   *     ColorInfo#isTransferHdr(ColorInfo) HDR}, and RGB BT.709 if not.
-   * @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files or an
-   *     operation fails or is unsupported.
+   *     OpenGL operation fails or is unsupported.
   */
  public static MatrixShaderProgram createWithInternalSampler(
      Context context,
@@ -192,7 +192,7 @@ import java.util.List;
      List<RgbMatrix> rgbMatrices,
      ColorInfo inputColorInfo,
      ColorInfo outputColorInfo)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    checkState(
        !ColorInfo.isTransferHdr(inputColorInfo),
        "MatrixShaderProgram doesn't support HDR internal sampler input yet.");
@@ -227,8 +227,8 @@ import java.util.List;
   * @param outputColorInfo The output electrical (nonlinear) or optical (linear) {@link ColorInfo}.
   *     If this is an optical color, it must be BT.2020 if {@code inputColorInfo} is {@linkplain
   *     ColorInfo#isTransferHdr(ColorInfo) HDR}, and RGB BT.709 if not.
-   * @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files or an
-   *     operation fails or is unsupported.
+   *     OpenGL operation fails or is unsupported.
   */
  public static MatrixShaderProgram createWithExternalSampler(
      Context context,
@@ -236,7 +236,7 @@ import java.util.List;
      List<RgbMatrix> rgbMatrices,
      ColorInfo inputColorInfo,
      ColorInfo outputColorInfo)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    boolean isInputTransferHdr = ColorInfo.isTransferHdr(inputColorInfo);
    String vertexShaderFilePath =
        isInputTransferHdr
@@ -270,15 +270,15 @@ import java.util.List;
   * @param rgbMatrices The {@link RgbMatrix RgbMatrices} to apply to each frame in order. Can be
   *     empty to apply no color transformations.
   * @param outputColorInfo The electrical (non-linear) {@link ColorInfo} describing output colors.
-   * @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files or an
-   *     operation fails or is unsupported.
+   *     OpenGL operation fails or is unsupported.
   */
  public static MatrixShaderProgram createApplyingOetf(
      Context context,
      List<GlMatrixTransformation> matrixTransformations,
      List<RgbMatrix> rgbMatrices,
      ColorInfo outputColorInfo)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    boolean outputIsHdr = ColorInfo.isTransferHdr(outputColorInfo);
    String vertexShaderFilePath =
        outputIsHdr ? VERTEX_SHADER_TRANSFORMATION_ES3_PATH : VERTEX_SHADER_TRANSFORMATION_PATH;
@@ -315,7 +315,7 @@ import java.util.List;
      List<RgbMatrix> rgbMatrices,
      ColorInfo inputColorInfo,
      ColorInfo outputColorInfo)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    boolean isInputTransferHdr = ColorInfo.isTransferHdr(inputColorInfo);
    @C.ColorTransfer int outputColorTransfer = outputColorInfo.colorTransfer;
    if (isInputTransferHdr) {
@@ -323,7 +323,7 @@ import java.util.List;
      // In HDR editing mode the decoder output is sampled in YUV.
      if (!GlUtil.isYuvTargetExtensionSupported()) {
-        throw new FrameProcessingException(
+        throw new VideoFrameProcessingException(
            "The EXT_YUV_target extension is required for HDR editing input.");
      }
      glProgram.setFloatsUniform(
@@ -396,13 +396,13 @@ import java.util.List;
  private static GlProgram createGlProgram(
      Context context, String vertexShaderFilePath, String fragmentShaderFilePath)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    GlProgram glProgram;
    try {
      glProgram = new GlProgram(context, vertexShaderFilePath, fragmentShaderFilePath);
    } catch (IOException | GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    float[] identityMatrix = GlUtil.create4x4IdentityMatrix();
@@ -421,7 +421,8 @@ import java.util.List;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    updateCompositeRgbaMatrixArray(presentationTimeUs);
    updateCompositeTransformationMatrixAndVisiblePolygon(presentationTimeUs);
    if (visiblePolygon.size() < 3) {
@@ -442,17 +443,17 @@ import java.util.List;
          GLES20.GL_TRIANGLE_FAN, /* first= */ 0, /* count= */ visiblePolygon.size());
      GlUtil.checkGlError();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e, presentationTimeUs);
+      throw new VideoFrameProcessingException(e, presentationTimeUs);
    }
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    super.release();
    try {
      glProgram.delete();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/OverlayEffect.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/OverlayEffect.java
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.effect;
 import android.content.Context;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 /**
@@ -38,7 +38,7 @@ public final class OverlayEffect implements GlEffect {
  @Override
  public SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return new OverlayShaderProgram(context, useHdr, overlays);
  }
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/OverlayShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/OverlayShaderProgram.java
@@ -21,11 +21,11 @@ import android.content.Context;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
 import android.util.Pair;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 /** Applies zero or more {@link TextureOverlay}s onto each frame. */
@@ -49,11 +49,11 @@ import com.google.common.collect.ImmutableList;
   * @param context The {@link Context}.
   * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
   *     in linear RGB BT.2020. If {@code false}, colors will be in linear RGB BT.709.
-   * @throws FrameProcessingException If a problem occurs while reading shader files.
+   * @throws VideoFrameProcessingException If a problem occurs while reading shader files.
   */
  public OverlayShaderProgram(
      Context context, boolean useHdr, ImmutableList<TextureOverlay> overlays)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    super(useHdr);
    checkArgument(!useHdr, "OverlayShaderProgram does not support HDR colors yet.");
    // The maximum number of samplers allowed in a single GL program is 16.
@@ -70,7 +70,7 @@ import com.google.common.collect.ImmutableList;
      glProgram =
          new GlProgram(createVertexShader(overlays.size()), createFragmentShader(overlays.size()));
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
    glProgram.setBufferAttribute(
@@ -91,7 +91,8 @@ import com.google.common.collect.ImmutableList;
  }
  @Override
-  public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
+  public void drawFrame(int inputTexId, long presentationTimeUs)
+      throws VideoFrameProcessingException {
    try {
      glProgram.use();
      if (!overlays.isEmpty()) {
@@ -155,17 +156,17 @@ import com.google.common.collect.ImmutableList;
      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
      GlUtil.checkGlError();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e, presentationTimeUs);
+      throw new VideoFrameProcessingException(e, presentationTimeUs);
    }
  }
  @Override
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    super.release();
    try {
      glProgram.delete();
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException(e);
+      throw new VideoFrameProcessingException(e);
    }
  }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
@@ -19,7 +19,7 @@ package com.google.android.exoplayer2.effect;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import android.content.Context;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 /** Provides common color filters. */
@@ -90,7 +90,7 @@ public class RgbFilter implements RgbMatrix {
  @Override
  public SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    checkForConsistentHdrSetting(useHdr);
    return RgbMatrix.super.toGlShaderProgram(context, useHdr);
  }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
@@ -17,7 +17,7 @@
 package com.google.android.exoplayer2.effect;
 import android.content.Context;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.collect.ImmutableList;
 /**
@@ -39,7 +39,7 @@ public interface RgbMatrix extends GlEffect {
  @Override
  default SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    return MatrixShaderProgram.create(
        context,
        /* matrixTransformations= */ ImmutableList.of(),

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
@@ -24,9 +24,9 @@ import android.graphics.Bitmap;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /** Transforms the colors of a frame by applying the same color lookup table to each frame. */
 public class SingleColorLut implements ColorLut {
@@ -148,13 +148,13 @@ public class SingleColorLut implements ColorLut {
  @Override
  public SingleFrameGlShaderProgram toGlShaderProgram(Context context, boolean useHdr)
-      throws FrameProcessingException {
+      throws VideoFrameProcessingException {
    checkState(!useHdr, "HDR is currently not supported.");
    try {
      lutTextureId = storeLutAsTexture(lut);
    } catch (GlUtil.GlException e) {
-      throw new FrameProcessingException("Could not store the LUT as a texture.", e);
+      throw new VideoFrameProcessingException("Could not store the LUT as a texture.", e);
    }
    return new ColorLutShaderProgram(context, /* colorLut= */ this, useHdr);

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleFrameGlShaderProgram.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleFrameGlShaderProgram.java
@@ -18,9 +18,9 @@ package com.google.android.exoplayer2.effect;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import androidx.annotation.CallSuper;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Executor;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
@@ -59,7 +59,7 @@ public abstract class SingleFrameGlShaderProgram implements GlShaderProgram {
    this.useHdr = useHdr;
    inputListener = new InputListener() {};
    outputListener = new OutputListener() {};
-    errorListener = (frameProcessingException) -> {};
+    errorListener = (videoFrameProcessingException) -> {};
    errorListenerExecutor = MoreExecutors.directExecutor();
  }
@@ -72,9 +72,10 @@ public abstract class SingleFrameGlShaderProgram implements GlShaderProgram {
   * @param inputWidth The input width, in pixels.
   * @param inputHeight The input height, in pixels.
   * @return The output width and height of frames processed through {@link #drawFrame(int, long)}.
-   * @throws FrameProcessingException If an error occurs while configuring.
+   * @throws VideoFrameProcessingException If an error occurs while configuring.
   */
-  public abstract Size configure(int inputWidth, int inputHeight) throws FrameProcessingException;
+  public abstract Size configure(int inputWidth, int inputHeight)
+      throws VideoFrameProcessingException;
  /**
   * Draws one frame.
@@ -88,10 +89,10 @@ public abstract class SingleFrameGlShaderProgram implements GlShaderProgram {
   *
   * @param inputTexId Identifier of a 2D OpenGL texture containing the input frame.
   * @param presentationTimeUs The presentation timestamp of the current frame, in microseconds.
-   * @throws FrameProcessingException If an error occurs while processing or drawing the frame.
+   * @throws VideoFrameProcessingException If an error occurs while processing or drawing the frame.
   */
  public abstract void drawFrame(int inputTexId, long presentationTimeUs)
-      throws FrameProcessingException;
+      throws VideoFrameProcessingException;
  @Override
  public final void setInputListener(InputListener inputListener) {
@@ -132,19 +133,19 @@ public abstract class SingleFrameGlShaderProgram implements GlShaderProgram {
      drawFrame(inputTexture.texId, presentationTimeUs);
      inputListener.onInputFrameProcessed(inputTexture);
      outputListener.onOutputFrameAvailable(outputTexture, presentationTimeUs);
-    } catch (FrameProcessingException | GlUtil.GlException | RuntimeException e) {
+    } catch (VideoFrameProcessingException | GlUtil.GlException | RuntimeException e) {
      errorListenerExecutor.execute(
          () ->
-              errorListener.onFrameProcessingError(
+              errorListener.onError(
-                  e instanceof FrameProcessingException
+                  e instanceof VideoFrameProcessingException
-                      ? (FrameProcessingException) e
+                      ? (VideoFrameProcessingException) e
-                      : new FrameProcessingException(e)));
+                      : new VideoFrameProcessingException(e)));
    }
  }
  @EnsuresNonNull("outputTexture")
  private void configureOutputTexture(int inputWidth, int inputHeight)
-      throws GlUtil.GlException, FrameProcessingException {
+      throws GlUtil.GlException, VideoFrameProcessingException {
    this.inputWidth = inputWidth;
    this.inputHeight = inputHeight;
    Size outputSize = configure(inputWidth, inputHeight);
@@ -182,12 +183,12 @@ public abstract class SingleFrameGlShaderProgram implements GlShaderProgram {
  @Override
  @CallSuper
-  public void release() throws FrameProcessingException {
+  public void release() throws VideoFrameProcessingException {
    if (outputTexture != null) {
      try {
        GlUtil.deleteTexture(outputTexture.texId);
      } catch (GlUtil.GlException e) {
-        throw new FrameProcessingException(e);
+        throw new VideoFrameProcessingException(e);
      }
    }
  }

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureOverlay.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureOverlay.java
@@ -15,8 +15,8 @@
 */
 package com.google.android.exoplayer2.effect;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.Size;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /** Creates overlays from OpenGL textures. */
 public abstract class TextureOverlay {
@@ -24,9 +24,9 @@ public abstract class TextureOverlay {
   * Returns the overlay texture identifier displayed at the specified timestamp.
   *
   * @param presentationTimeUs The presentation timestamp of the current frame, in microseconds.
-   * @throws FrameProcessingException If an error occurs while processing or drawing the frame.
+   * @throws VideoFrameProcessingException If an error occurs while processing or drawing the frame.
   */
-  public abstract int getTextureId(long presentationTimeUs) throws FrameProcessingException;
+  public abstract int getTextureId(long presentationTimeUs) throws VideoFrameProcessingException;
  // This method is required to find the size of a texture given a texture identifier using OpenGL
  // ES 2.0. OpenGL ES 3.1 can do this with glGetTexLevelParameteriv().

--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTask.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTask.java
@@ -15,14 +15,14 @@
 */
 package com.google.android.exoplayer2.effect;
-import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
 /**
 * Interface for tasks that may throw a {@link GlUtil.GlException} or {@link
- * FrameProcessingException}.
+ * VideoFrameProcessingException}.
 */
-/* package */ interface FrameProcessingTask {
+/* package */ interface VideoFrameProcessingTask {
  /** Runs the task. */
-  void run() throws FrameProcessingException, GlUtil.GlException;
+  void run() throws VideoFrameProcessingException, GlUtil.GlException;
 }
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTaskExecutor.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTaskExecutor.java
@@ -19,8 +19,8 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
-import com.google.android.exoplayer2.util.FrameProcessor;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import java.util.ArrayDeque;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -29,36 +29,36 @@ import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 /**
- * Wrapper around a single thread {@link ExecutorService} for executing {@link FrameProcessingTask}
+ * Wrapper around a single thread {@link ExecutorService} for executing {@link
- * instances.
+ * VideoFrameProcessingTask} instances.
 *
 * <p>Public methods can be called from any thread.
 *
 * <p>The wrapper handles calling {@link
- * FrameProcessor.Listener#onFrameProcessingError(FrameProcessingException)} for errors that occur
+ * VideoFrameProcessor.Listener#onError(VideoFrameProcessingException)} for errors that occur during
- * during these tasks. The listener is invoked from the {@link ExecutorService}. Errors are assumed
+ * these tasks. The listener is invoked from the {@link ExecutorService}. Errors are assumed to be
- * to be non-recoverable, so the {@code FrameProcessingTaskExecutor} should be released if an error
+ * non-recoverable, so the {@code VideoFrameProcessingTaskExecutor} should be released if an error
 * occurs.
 *
- * <p>{@linkplain #submitWithHighPriority(FrameProcessingTask) High priority tasks} are always
+ * <p>{@linkplain #submitWithHighPriority(VideoFrameProcessingTask) High priority tasks} are always
- * executed before {@linkplain #submit(FrameProcessingTask) default priority tasks}. Tasks with
+ * executed before {@linkplain #submit(VideoFrameProcessingTask) default priority tasks}. Tasks with
 * equal priority are executed in FIFO order.
 */
-/* package */ final class FrameProcessingTaskExecutor {
+/* package */ final class VideoFrameProcessingTaskExecutor {
  private final ExecutorService singleThreadExecutorService;
-  private final FrameProcessor.Listener listener;
+  private final VideoFrameProcessor.Listener listener;
  private final Object lock;
  @GuardedBy("lock")
-  private final ArrayDeque<FrameProcessingTask> highPriorityTasks;
+  private final ArrayDeque<VideoFrameProcessingTask> highPriorityTasks;
  @GuardedBy("lock")
  private boolean shouldCancelTasks;
  /** Creates a new instance. */
-  public FrameProcessingTaskExecutor(
+  public VideoFrameProcessingTaskExecutor(
-      ExecutorService singleThreadExecutorService, FrameProcessor.Listener listener) {
+      ExecutorService singleThreadExecutorService, VideoFrameProcessor.Listener listener) {
    this.singleThreadExecutorService = singleThreadExecutorService;
    this.listener = listener;
    lock = new Object();
@@ -66,11 +66,11 @@ import java.util.concurrent.RejectedExecutionException;
  }
  /**
-   * Submits the given {@link FrameProcessingTask} to be executed after all pending tasks have
+   * Submits the given {@link VideoFrameProcessingTask} to be executed after all pending tasks have
   * completed.
   */
  @SuppressWarnings("FutureReturnValueIgnored")
-  public void submit(FrameProcessingTask task) {
+  public void submit(VideoFrameProcessingTask task) {
    @Nullable RejectedExecutionException executionException = null;
    synchronized (lock) {
      if (shouldCancelTasks) {
@@ -89,13 +89,13 @@ import java.util.concurrent.RejectedExecutionException;
  }
  /**
-   * Submits the given {@link FrameProcessingTask} to be executed after the currently running task
+   * Submits the given {@link VideoFrameProcessingTask} to be executed after the currently running
-   * and all previously submitted high-priority tasks have completed.
+   * task and all previously submitted high-priority tasks have completed.
   *
-   * <p>Tasks that were previously {@linkplain #submit(FrameProcessingTask) submitted} without
+   * <p>Tasks that were previously {@linkplain #submit(VideoFrameProcessingTask) submitted} without
   * high-priority and have not started executing will be executed after this task is complete.
   */
-  public void submitWithHighPriority(FrameProcessingTask task) {
+  public void submitWithHighPriority(VideoFrameProcessingTask task) {
    synchronized (lock) {
      if (shouldCancelTasks) {
        return;
@@ -111,7 +111,7 @@ import java.util.concurrent.RejectedExecutionException;
  /**
   * Flushes all scheduled tasks.
   *
-   * <p>During flush, the {@code FrameProcessingTaskExecutor} ignores the {@linkplain #submit
+   * <p>During flush, the {@code VideoFrameProcessingTaskExecutor} ignores the {@linkplain #submit
   * submission of new tasks}. The tasks that are submitted before flushing are either executed or
   * canceled when this method returns.
   */
@@ -137,12 +137,12 @@ import java.util.concurrent.RejectedExecutionException;
  /**
   * Cancels remaining tasks, runs the given release task, and shuts down the background thread.
   *
-   * @param releaseTask A {@link FrameProcessingTask} to execute before shutting down the background
+   * @param releaseTask A {@link VideoFrameProcessingTask} to execute before shutting down the
-   *     thread.
+   *     background thread.
   * @param releaseWaitTimeMs How long to wait for the release task to terminate, in milliseconds.
   * @throws InterruptedException If interrupted while releasing resources.
   */
-  public void release(FrameProcessingTask releaseTask, long releaseWaitTimeMs)
+  public void release(VideoFrameProcessingTask releaseTask, long releaseWaitTimeMs)
      throws InterruptedException {
    synchronized (lock) {
      shouldCancelTasks = true;
@@ -153,16 +153,16 @@ import java.util.concurrent.RejectedExecutionException;
    singleThreadExecutorService.shutdown();
    try {
      if (!singleThreadExecutorService.awaitTermination(releaseWaitTimeMs, MILLISECONDS)) {
-        listener.onFrameProcessingError(new FrameProcessingException("Release timed out"));
+        listener.onError(new VideoFrameProcessingException("Release timed out"));
      }
      releaseFuture.get();
    } catch (ExecutionException e) {
-      listener.onFrameProcessingError(new FrameProcessingException(e));
+      listener.onError(new VideoFrameProcessingException(e));
    }
  }
  private Future<?> wrapTaskAndSubmitToExecutorService(
-      FrameProcessingTask defaultPriorityTask, boolean isFlushOrReleaseTask) {
+      VideoFrameProcessingTask defaultPriorityTask, boolean isFlushOrReleaseTask) {
    return singleThreadExecutorService.submit(
        () -> {
          try {
@@ -172,7 +172,7 @@ import java.util.concurrent.RejectedExecutionException;
              }
            }
-            @Nullable FrameProcessingTask nextHighPriorityTask;
+            @Nullable VideoFrameProcessingTask nextHighPriorityTask;
            while (true) {
              synchronized (lock) {
                // Lock only polling to prevent blocking the public method calls.
@@ -199,6 +199,6 @@ import java.util.concurrent.RejectedExecutionException;
      }
      shouldCancelTasks = true;
    }
-    listener.onFrameProcessingError(FrameProcessingException.from(exception));
+    listener.onError(VideoFrameProcessingException.from(exception));
  }
 }
--- a/library/effect/src/test/java/com/google/android/exoplayer2/effect/ChainingGlShaderProgramListenerTest.java
+++ b/library/effect/src/test/java/com/google/android/exoplayer2/effect/ChainingGlShaderProgramListenerTest.java
@@ -19,8 +19,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,20 +30,22 @@ import org.junit.runner.RunWith;
 public final class ChainingGlShaderProgramListenerTest {
  private static final long EXECUTOR_WAIT_TIME_MS = 100;
-  private final FrameProcessor.Listener mockFrameProcessorListener =
+  private final VideoFrameProcessor.Listener mockFrameProcessorListener =
-      mock(FrameProcessor.Listener.class);
+      mock(VideoFrameProcessor.Listener.class);
-  private final FrameProcessingTaskExecutor frameProcessingTaskExecutor =
+  private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor =
-      new FrameProcessingTaskExecutor(
+      new VideoFrameProcessingTaskExecutor(
          Util.newSingleThreadExecutor("Test"), mockFrameProcessorListener);
  private final GlShaderProgram mockProducingGlShaderProgram = mock(GlShaderProgram.class);
  private final GlShaderProgram mockConsumingGlShaderProgram = mock(GlShaderProgram.class);
  private final ChainingGlShaderProgramListener chainingGlShaderProgramListener =
      new ChainingGlShaderProgramListener(
-          mockProducingGlShaderProgram, mockConsumingGlShaderProgram, frameProcessingTaskExecutor);
+          mockProducingGlShaderProgram,
+          mockConsumingGlShaderProgram,
+          videoFrameProcessingTaskExecutor);
  @After
  public void release() throws InterruptedException {
-    frameProcessingTaskExecutor.release(/* releaseTask= */ () -> {}, EXECUTOR_WAIT_TIME_MS);
+    videoFrameProcessingTaskExecutor.release(/* releaseTask= */ () -> {}, EXECUTOR_WAIT_TIME_MS);
  }
  @Test

--- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java
+++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java
@@ -28,9 +28,9 @@ import android.graphics.Bitmap;
 import android.util.Log;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor;
+import com.google.android.exoplayer2.effect.DefaultVideoFrameProcessor;
 import com.google.android.exoplayer2.testutil.DecodeOneFrameUtil;
-import com.google.android.exoplayer2.testutil.FrameProcessorTestRunner;
+import com.google.android.exoplayer2.testutil.VideoFrameProcessorTestRunner;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
@@ -40,10 +40,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 /**
- * Instrumentation pixel-test for HDR to SDR tone-mapping via {@link GlEffectsFrameProcessor}.
+ * Instrumentation pixel-test for HDR to SDR tone-mapping via {@link DefaultVideoFrameProcessor}.
 *
- * <p>Uses a {@link GlEffectsFrameProcessor} to process one frame, and checks that the actual output
+ * <p>Uses a {@link DefaultVideoFrameProcessor} to process one frame, and checks that the actual
- * matches expected output, either from a golden file or from another edit.
+ * output matches expected output, either from a golden file or from another edit.
 */
 // TODO(b/263395272): Move this test to effects/mh tests.
 @RunWith(AndroidJUnit4.class)
@@ -75,12 +75,12 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
      "OpenGL-based HDR to SDR tone mapping is unsupported below API 29.";
  private static final String SKIP_REASON_NO_YUV = "Device lacks YUV extension support.";
-  private @MonotonicNonNull FrameProcessorTestRunner frameProcessorTestRunner;
+  private @MonotonicNonNull VideoFrameProcessorTestRunner videoFrameProcessorTestRunner;
  @After
  public void release() {
-    if (frameProcessorTestRunner != null) {
+    if (videoFrameProcessorTestRunner != null) {
-      frameProcessorTestRunner.release();
+      videoFrameProcessorTestRunner.release();
    }
  }
@@ -114,7 +114,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
            .setColorRange(C.COLOR_RANGE_LIMITED)
            .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
            .build();
-    frameProcessorTestRunner =
+    videoFrameProcessorTestRunner =
        getDefaultFrameProcessorTestRunnerBuilder(testId)
            .setVideoAssetPath(INPUT_HLG_MP4_ASSET_STRING)
            .setInputColorInfo(hlgColor)
@@ -124,7 +124,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
    Bitmap actualBitmap;
    try {
-      actualBitmap = frameProcessorTestRunner.processFirstFrameAndEnd();
+      actualBitmap = videoFrameProcessorTestRunner.processFirstFrameAndEnd();
    } catch (UnsupportedOperationException e) {
      if (e.getMessage() != null
          && e.getMessage().equals(DecodeOneFrameUtil.NO_DECODER_SUPPORT_ERROR_STRING)) {
@@ -177,7 +177,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
            .setColorRange(C.COLOR_RANGE_LIMITED)
            .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
            .build();
-    frameProcessorTestRunner =
+    videoFrameProcessorTestRunner =
        getDefaultFrameProcessorTestRunnerBuilder(testId)
            .setVideoAssetPath(INPUT_PQ_MP4_ASSET_STRING)
            .setInputColorInfo(pqColor)
@@ -187,7 +187,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
    Bitmap actualBitmap;
    try {
-      actualBitmap = frameProcessorTestRunner.processFirstFrameAndEnd();
+      actualBitmap = videoFrameProcessorTestRunner.processFirstFrameAndEnd();
    } catch (UnsupportedOperationException e) {
      if (e.getMessage() != null
          && e.getMessage().equals(DecodeOneFrameUtil.NO_DECODER_SUPPORT_ERROR_STRING)) {
@@ -209,10 +209,10 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
        .isAtMost(MAXIMUM_DEVICE_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE);
  }
-  private FrameProcessorTestRunner.Builder getDefaultFrameProcessorTestRunnerBuilder(
+  private VideoFrameProcessorTestRunner.Builder getDefaultFrameProcessorTestRunnerBuilder(
      String testId) {
-    return new FrameProcessorTestRunner.Builder()
+    return new VideoFrameProcessorTestRunner.Builder()
        .setTestId(testId)
-        .setFrameProcessorFactory(new GlEffectsFrameProcessor.Factory());
+        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory());
  }
 }
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Effects.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Effects.java
@@ -17,9 +17,9 @@ package com.google.android.exoplayer2.transformer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.audio.AudioProcessor;
-import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor;
+import com.google.android.exoplayer2.effect.DefaultVideoFrameProcessor;
 import com.google.android.exoplayer2.util.Effect;
-import com.google.android.exoplayer2.util.FrameProcessor;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -43,19 +43,19 @@ public final class Effects {
   */
  public final ImmutableList<Effect> videoEffects;
  /**
-   * The {@link FrameProcessor.Factory} for the {@link FrameProcessor} to use when applying the
+   * The {@link VideoFrameProcessor.Factory} for the {@link VideoFrameProcessor} to use when
-   * {@code videoEffects} to the video frames.
+   * applying the {@code videoEffects} to the video frames.
   */
-  public final FrameProcessor.Factory frameProcessorFactory;
+  public final VideoFrameProcessor.Factory videoFrameProcessorFactory;
  /**
-   * Creates an instance using a {@link GlEffectsFrameProcessor.Factory}.
+   * Creates an instance using a {@link DefaultVideoFrameProcessor.Factory}.
   *
-   * <p>This is equivalent to calling {@link Effects#Effects(List, List, FrameProcessor.Factory)}
+   * <p>This is equivalent to calling {@link Effects#Effects(List, List,
-   * with a {@link GlEffectsFrameProcessor.Factory}.
+   * VideoFrameProcessor.Factory)} with a {@link DefaultVideoFrameProcessor.Factory}.
   */
  public Effects(List<AudioProcessor> audioProcessors, List<Effect> videoEffects) {
-    this(audioProcessors, videoEffects, new GlEffectsFrameProcessor.Factory());
+    this(audioProcessors, videoEffects, new DefaultVideoFrameProcessor.Factory());
  }
  /**
@@ -63,14 +63,14 @@ public final class Effects {
   *
   * @param audioProcessors The {@link #audioProcessors}.
   * @param videoEffects The {@link #videoEffects}.
-   * @param frameProcessorFactory The {@link #frameProcessorFactory}.
+   * @param videoFrameProcessorFactory The {@link #videoFrameProcessorFactory}.
   */
  public Effects(
      List<AudioProcessor> audioProcessors,
      List<Effect> videoEffects,
-      FrameProcessor.Factory frameProcessorFactory) {
+      VideoFrameProcessor.Factory videoFrameProcessorFactory) {
    this.audioProcessors = ImmutableList.copyOf(audioProcessors);
    this.videoEffects = ImmutableList.copyOf(videoEffects);
-    this.frameProcessorFactory = frameProcessorFactory;
+    this.videoFrameProcessorFactory = videoFrameProcessorFactory;
  }
 }
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java
@@ -23,9 +23,9 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat;
 import com.google.android.exoplayer2.util.Clock;
-import com.google.android.exoplayer2.util.FrameProcessingException;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import com.google.common.collect.ImmutableBiMap;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -64,7 +64,7 @@ public final class TransformationException extends Exception {
        ERROR_CODE_ENCODER_INIT_FAILED,
        ERROR_CODE_ENCODING_FAILED,
        ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED,
-        ERROR_CODE_FRAME_PROCESSING_FAILED,
+        ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED,
        ERROR_CODE_AUDIO_PROCESSING_FAILED,
        ERROR_CODE_MUXING_FAILED,
      })
@@ -149,8 +149,8 @@ public final class TransformationException extends Exception {
  // Video editing errors (5xxx).
-  /** Caused by a frame processing failure. */
+  /** Caused by a video frame processing failure. */
-  public static final int ERROR_CODE_FRAME_PROCESSING_FAILED = 5001;
+  public static final int ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED = 5001;
  // Audio processing errors (6xxx).
@@ -180,7 +180,7 @@ public final class TransformationException extends Exception {
          .put("ERROR_CODE_ENCODER_INIT_FAILED", ERROR_CODE_ENCODER_INIT_FAILED)
          .put("ERROR_CODE_ENCODING_FAILED", ERROR_CODE_ENCODING_FAILED)
          .put("ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED", ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED)
-          .put("ERROR_CODE_FRAME_PROCESSING_FAILED", ERROR_CODE_FRAME_PROCESSING_FAILED)
+          .put("ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED", ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED)
          .put("ERROR_CODE_AUDIO_PROCESSING_FAILED", ERROR_CODE_AUDIO_PROCESSING_FAILED)
          .put("ERROR_CODE_MUXING_FAILED", ERROR_CODE_MUXING_FAILED)
          .buildOrThrow();
@@ -269,15 +269,15 @@ public final class TransformationException extends Exception {
  }
  /**
-   * Creates an instance for a {@link FrameProcessor} related exception.
+   * Creates an instance for a {@link VideoFrameProcessor} related exception.
   *
   * @param cause The cause of the failure.
   * @param errorCode See {@link #errorCode}.
   * @return The created instance.
   */
-  /* package */ static TransformationException createForFrameProcessingException(
+  /* package */ static TransformationException createForVideoFrameProcessingException(
-      FrameProcessingException cause, int errorCode) {
+      VideoFrameProcessingException cause, int errorCode) {
-    return new TransformationException("Frame processing error", cause, errorCode);
+    return new TransformationException("Video frame processing error", cause, errorCode);
  }
  /**

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
@@ -30,16 +30,16 @@ import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.SonicAudioProcessor;
-import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor;
+import com.google.android.exoplayer2.effect.DefaultVideoFrameProcessor;
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.DebugViewProvider;
 import com.google.android.exoplayer2.util.Effect;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.HandlerWrapper;
 import com.google.android.exoplayer2.util.ListenerSet;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.InlineMe;
@@ -87,7 +87,7 @@ public final class Transformer {
    private boolean generateSilentAudio;
    private ListenerSet<Transformer.Listener> listeners;
    private AssetLoader.@MonotonicNonNull Factory assetLoaderFactory;
-    private FrameProcessor.Factory frameProcessorFactory;
+    private VideoFrameProcessor.Factory videoFrameProcessorFactory;
    private Codec.EncoderFactory encoderFactory;
    private Muxer.Factory muxerFactory;
    private Looper looper;
@@ -104,7 +104,7 @@ public final class Transformer {
      transformationRequest = new TransformationRequest.Builder().build();
      audioProcessors = ImmutableList.of();
      videoEffects = ImmutableList.of();
-      frameProcessorFactory = new GlEffectsFrameProcessor.Factory();
+      videoFrameProcessorFactory = new DefaultVideoFrameProcessor.Factory();
      encoderFactory = new DefaultEncoderFactory.Builder(this.context).build();
      muxerFactory = new DefaultMuxer.Factory();
      looper = Util.getCurrentOrMainLooper();
@@ -124,7 +124,7 @@ public final class Transformer {
      this.generateSilentAudio = transformer.generateSilentAudio;
      this.listeners = transformer.listeners;
      this.assetLoaderFactory = transformer.assetLoaderFactory;
-      this.frameProcessorFactory = transformer.frameProcessorFactory;
+      this.videoFrameProcessorFactory = transformer.videoFrameProcessorFactory;
      this.encoderFactory = transformer.encoderFactory;
      this.muxerFactory = transformer.muxerFactory;
      this.looper = transformer.looper;
@@ -296,13 +296,14 @@ public final class Transformer {
    }
    /**
-     * @deprecated Set the {@link FrameProcessor.Factory} in an {@link EditedMediaItem}, and pass it
+     * @deprecated Set the {@link VideoFrameProcessor.Factory} in an {@link EditedMediaItem}, and
-     *     to {@link #start(EditedMediaItem, String)} instead.
+     *     pass it to {@link #start(EditedMediaItem, String)} instead.
     */
    @CanIgnoreReturnValue
    @Deprecated
-    public Builder setFrameProcessorFactory(FrameProcessor.Factory frameProcessorFactory) {
+    public Builder setFrameProcessorFactory(
-      this.frameProcessorFactory = frameProcessorFactory;
+        VideoFrameProcessor.Factory videoFrameProcessorFactory) {
+      this.videoFrameProcessorFactory = videoFrameProcessorFactory;
      return this;
    }
@@ -448,7 +449,7 @@ public final class Transformer {
          generateSilentAudio,
          listeners,
          assetLoaderFactory,
-          frameProcessorFactory,
+          videoFrameProcessorFactory,
          encoderFactory,
          muxerFactory,
          looper,
@@ -606,7 +607,7 @@ public final class Transformer {
  private final boolean generateSilentAudio;
  private final ListenerSet<Transformer.Listener> listeners;
  private final AssetLoader.Factory assetLoaderFactory;
-  private final FrameProcessor.Factory frameProcessorFactory;
+  private final VideoFrameProcessor.Factory videoFrameProcessorFactory;
  private final Codec.EncoderFactory encoderFactory;
  private final Muxer.Factory muxerFactory;
  private final Looper looper;
@@ -627,7 +628,7 @@ public final class Transformer {
      boolean generateSilentAudio,
      ListenerSet<Listener> listeners,
      AssetLoader.Factory assetLoaderFactory,
-      FrameProcessor.Factory frameProcessorFactory,
+      VideoFrameProcessor.Factory videoFrameProcessorFactory,
      Codec.EncoderFactory encoderFactory,
      Muxer.Factory muxerFactory,
      Looper looper,
@@ -645,7 +646,7 @@ public final class Transformer {
    this.generateSilentAudio = generateSilentAudio;
    this.listeners = listeners;
    this.assetLoaderFactory = assetLoaderFactory;
-    this.frameProcessorFactory = frameProcessorFactory;
+    this.videoFrameProcessorFactory = videoFrameProcessorFactory;
    this.encoderFactory = encoderFactory;
    this.muxerFactory = muxerFactory;
    this.looper = looper;
@@ -842,7 +843,7 @@ public final class Transformer {
            .setRemoveAudio(removeAudio)
            .setRemoveVideo(removeVideo)
            .setFlattenForSlowMotion(flattenForSlowMotion)
-            .setEffects(new Effects(audioProcessors, videoEffects, frameProcessorFactory))
+            .setEffects(new Effects(audioProcessors, videoEffects, videoFrameProcessorFactory))
            .build();
    start(editedMediaItem, path);
  }

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
@@ -498,7 +498,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
            streamOffsetUs,
            transformationRequest,
            firstEditedMediaItem.effects.videoEffects,
-            firstEditedMediaItem.effects.frameProcessorFactory,
+            firstEditedMediaItem.effects.videoFrameProcessorFactory,
            encoderFactory,
            muxerWrapper,
            /* errorConsumer= */ this::onError,

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
@@ -38,12 +38,12 @@ import com.google.android.exoplayer2.util.Consumer;
 import com.google.android.exoplayer2.util.DebugViewProvider;
 import com.google.android.exoplayer2.util.Effect;
 import com.google.android.exoplayer2.util.FrameInfo;
-import com.google.android.exoplayer2.util.FrameProcessingException;
-import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.VideoFrameProcessingException;
+import com.google.android.exoplayer2.util.VideoFrameProcessor;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -58,8 +58,8 @@ import org.checkerframework.dataflow.qual.Pure;
  /** MIME type to use for output video if the input type is not a video. */
  private static final String DEFAULT_OUTPUT_MIME_TYPE = MimeTypes.VIDEO_H265;
-  private final FrameProcessor frameProcessor;
+  private final VideoFrameProcessor videoFrameProcessor;
-  private final ColorInfo frameProcessorInputColor;
+  private final ColorInfo videoFrameProcessorInputColor;
  private final FrameInfo firstFrameInfo;
  private final EncoderWrapper encoderWrapper;
@@ -67,7 +67,7 @@ import org.checkerframework.dataflow.qual.Pure;
  /**
   * The timestamp of the last buffer processed before {@linkplain
-   * FrameProcessor.Listener#onFrameProcessingEnded() frame processing has ended}.
+   * VideoFrameProcessor.Listener#onEnded() frame processing has ended}.
   */
  private volatile long finalFramePresentationTimeUs;
@@ -78,7 +78,7 @@ import org.checkerframework.dataflow.qual.Pure;
      long streamOffsetUs,
      TransformationRequest transformationRequest,
      ImmutableList<Effect> effects,
-      FrameProcessor.Factory frameProcessorFactory,
+      VideoFrameProcessor.Factory videoFrameProcessorFactory,
      Codec.EncoderFactory encoderFactory,
      MuxerWrapper muxerWrapper,
      Consumer<TransformationException> errorConsumer,
@@ -122,12 +122,12 @@ import org.checkerframework.dataflow.qual.Pure;
    ColorInfo encoderInputColor = encoderWrapper.getSupportedInputColor();
    // If not tone mapping using OpenGL, the decoder will output the encoderInputColor,
    // possibly by tone mapping.
-    frameProcessorInputColor =
+    videoFrameProcessorInputColor =
        isGlToneMapping ? checkNotNull(firstInputFormat.colorInfo) : encoderInputColor;
    // For consistency with the Android platform, OpenGL tone mapping outputs colors with
    // C.COLOR_TRANSFER_GAMMA_2_2 instead of C.COLOR_TRANSFER_SDR, and outputs this as
    // C.COLOR_TRANSFER_SDR to the encoder.
-    ColorInfo frameProcessorOutputColor =
+    ColorInfo videoFrameProcessorOutputColor =
        isGlToneMapping
            ? new ColorInfo.Builder()
                .setColorSpace(C.COLOR_SPACE_BT709)
@@ -136,23 +136,23 @@ import org.checkerframework.dataflow.qual.Pure;
                .build()
            : encoderInputColor;
    try {
-      frameProcessor =
+      videoFrameProcessor =
-          frameProcessorFactory.create(
+          videoFrameProcessorFactory.create(
              context,
              effects,
              debugViewProvider,
-              frameProcessorInputColor,
+              videoFrameProcessorInputColor,
-              frameProcessorOutputColor,
+              videoFrameProcessorOutputColor,
              MimeTypes.isVideo(firstInputFormat.sampleMimeType),
              /* releaseFramesAutomatically= */ true,
              MoreExecutors.directExecutor(),
-              new FrameProcessor.Listener() {
+              new VideoFrameProcessor.Listener() {
                private long lastProcessedFramePresentationTimeUs;
                @Override
                public void onOutputSizeChanged(int width, int height) {
                  try {
-                    checkNotNull(frameProcessor)
+                    checkNotNull(videoFrameProcessor)
                        .setOutputSurfaceInfo(encoderWrapper.getSurfaceInfo(width, height));
                  } catch (TransformationException exception) {
                    errorConsumer.accept(exception);
@@ -166,14 +166,15 @@ import org.checkerframework.dataflow.qual.Pure;
                }
                @Override
-                public void onFrameProcessingError(FrameProcessingException exception) {
+                public void onError(VideoFrameProcessingException exception) {
                  errorConsumer.accept(
-                      TransformationException.createForFrameProcessingException(
+                      TransformationException.createForVideoFrameProcessingException(
-                          exception, TransformationException.ERROR_CODE_FRAME_PROCESSING_FAILED));
+                          exception,
+                          TransformationException.ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED));
                }
                @Override
-                public void onFrameProcessingEnded() {
+                public void onEnded() {
                  VideoSamplePipeline.this.finalFramePresentationTimeUs =
                      lastProcessedFramePresentationTimeUs;
                  try {
@@ -183,9 +184,9 @@ import org.checkerframework.dataflow.qual.Pure;
                  }
                }
              });
-    } catch (FrameProcessingException e) {
+    } catch (VideoFrameProcessingException e) {
-      throw TransformationException.createForFrameProcessingException(
+      throw TransformationException.createForVideoFrameProcessingException(
-          e, TransformationException.ERROR_CODE_FRAME_PROCESSING_FAILED);
+          e, TransformationException.ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED);
    }
    // The decoder rotates encoded frames for display by firstInputFormat.rotationDegrees.
    int decodedWidth =
@@ -206,43 +207,43 @@ import org.checkerframework.dataflow.qual.Pure;
  @Override
  public void onMediaItemChanged(
      EditedMediaItem editedMediaItem, Format trackFormat, long mediaItemOffsetUs) {
-    frameProcessor.setInputFrameInfo(
+    videoFrameProcessor.setInputFrameInfo(
        new FrameInfo.Builder(firstFrameInfo).setOffsetToAddUs(mediaItemOffsetUs).build());
  }
  @Override
  public void queueInputBitmap(Bitmap inputBitmap, long durationUs, int frameRate) {
-    frameProcessor.queueInputBitmap(inputBitmap, durationUs, frameRate);
+    videoFrameProcessor.queueInputBitmap(inputBitmap, durationUs, frameRate);
  }
  @Override
  public Surface getInputSurface() {
-    return frameProcessor.getInputSurface();
+    return videoFrameProcessor.getInputSurface();
  }
  @Override
  public ColorInfo getExpectedInputColorInfo() {
-    return frameProcessorInputColor;
+    return videoFrameProcessorInputColor;
  }
  @Override
  public void registerVideoFrame() {
-    frameProcessor.registerInputFrame();
+    videoFrameProcessor.registerInputFrame();
  }
  @Override
  public int getPendingVideoFrameCount() {
-    return frameProcessor.getPendingInputFrameCount();
+    return videoFrameProcessor.getPendingInputFrameCount();
  }
  @Override
  public void signalEndOfVideoInput() {
-    frameProcessor.signalEndOfInput();
+    videoFrameProcessor.signalEndOfInput();
  }
  @Override
  public void release() {
-    frameProcessor.release();
+    videoFrameProcessor.release();
    encoderWrapper.release();
  }

--- a/media3-migration.sh
+++ b/media3-migration.sh
@@ -78,7 +78,7 @@ com.google.android.exoplayer2.text androidx.media3.common.text CueGroup Cue
 com.google.android.exoplayer2.text com.google.android.exoplayer2.text ExoplayerCuesDecoder SubtitleDecoderFactory TextOutput TextRenderer
 com.google.android.exoplayer2.upstream.crypto com.google.android.exoplayer2.upstream AesCipherDataSource AesCipherDataSink AesFlushingCipher
 com.google.android.exoplayer2.util com.google.android.exoplayer2.util AtomicFile Assertions BundleableUtil BundleUtil Clock ClosedSource CodecSpecificDataUtil ColorParser ConditionVariable Consumer CopyOnWriteMultiset EGLSurfaceTexture GlProgram GlUtil HandlerWrapper LibraryLoader ListenerSet Log LongArray MediaFormatUtil NetworkTypeObserver NonNullApi NotificationUtil ParsableBitArray ParsableByteArray RepeatModeUtil RunnableFutureTask Size SystemClock SystemHandlerWrapper TimedValueQueue TimestampAdjuster TraceUtil UnknownNull UnstableApi UriUtil Util XmlPullParserUtil
-com.google.android.exoplayer2.util androidx.media3.common DebugViewProvider Effect ErrorMessageProvider FlagSet FileTypes FrameInfo FrameProcessingException FrameProcessor MimeTypes PriorityTaskManager SurfaceInfo
+com.google.android.exoplayer2.util androidx.media3.common DebugViewProvider Effect ErrorMessageProvider FlagSet FileTypes FrameInfo VideoFrameProcessingException VideoFrameProcessor MimeTypes PriorityTaskManager SurfaceInfo
 com.google.android.exoplayer2.metadata androidx.media3.common Metadata
 com.google.android.exoplayer2.metadata com.google.android.exoplayer2.metadata MetadataDecoderFactory MetadataOutput MetadataRenderer
 com.google.android.exoplayer2.audio androidx.media3.common AudioAttributes AuxEffectInfo

--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FrameProcessorTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FrameProcessorTestRunner.java