Add APIs for redrawing effects.

PiperOrigin-RevId: 731255074

libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java

@@ -26,6 +26,7 @@ import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.TimestampIterator;
 import androidx.media3.common.util.UnstableApi;
+import com.google.common.collect.ImmutableList;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -201,6 +202,9 @@ public interface VideoFrameProcessor {
   @SuppressWarnings("GoodTime-ApiWithNumericTimeUnit") // This is a named constant, not a time unit.
   long RENDER_OUTPUT_FRAME_WITH_PRESENTATION_TIME = -3;
 
+  /** A maker for passing to {@link #registerInputStream} to signal a redraw. */
+  ImmutableList<Effect> REDRAW = ImmutableList.of(new Effect() {});
+
   /**
    * Provides an input {@link Bitmap} to the {@link VideoFrameProcessor}.
    *
@@ -272,6 +276,12 @@ public interface VideoFrameProcessor {
    */
   Surface getInputSurface();
 
+  /**
+   * Updates an {@linkplain Listener#onOutputFrameAvailableForRendering available frame} with the
+   * modified effects.
+   */
+  void redraw();
+
   /**
    * Informs the {@code VideoFrameProcessor} that a new input stream will be queued with the list of
    * {@link Effect Effects} to apply to the new input stream.

libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java

@@ -624,6 +624,11 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
     return inputSwitcher.getInputSurface();
   }
 
+  @Override
+  public void redraw() {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * {@inheritDoc}
    *

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java

@@ -1459,6 +1459,10 @@ public interface ExoPlayer extends Player {
    * Renderer#MSG_SET_VIDEO_OUTPUT_RESOLUTION} after calling this method. For {@link SurfaceView},
    * {@link TextureView} and {@link SurfaceHolder} output this happens automatically.
    *
+   * <p>Pass {@link androidx.media3.common.VideoFrameProcessor#REDRAW} to force the effect pipeline
+   * to redraw the effects immediately. To accurately interleave redraws, listen to {@link
+   * VideoFrameMetadataListener#onVideoFrameAboutToBeRendered} events.
+   *
    * <p>The following limitations exist for using {@linkplain Effect video effects}:
    *
    * <ul>

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java

@@ -118,6 +118,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     return true;
   }
 
+  @Override
+  public void redraw() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void flush(boolean resetPosition) {
     if (resetPosition) {

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java

@@ -53,6 +53,7 @@ import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Timeline;
+import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoSize;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.MediaFormatUtil;
@@ -1389,6 +1390,14 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
 
   /** Sets the {@linkplain Effect video effects} to apply. */
   public void setVideoEffects(List<Effect> effects) {
+    if (effects.equals(VideoFrameProcessor.REDRAW)) {
+      if (videoSink == null || !videoSink.isInitialized()) {
+        return;
+      }
+      videoSink.redraw();
+      return;
+    }
+
     videoEffects = effects;
     if (videoSink != null) {
       videoSink.setVideoEffects(effects);

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java

@@ -19,6 +19,7 @@ import static androidx.media3.common.VideoFrameProcessor.DROP_OUTPUT_FRAME;
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;
+import static androidx.media3.common.util.Util.castNonNull;
 import static androidx.media3.common.util.Util.contains;
 import static androidx.media3.common.util.Util.getMaxPendingFramesCountForMediaCodecDecoders;
 import static androidx.media3.exoplayer.video.VideoSink.INPUT_TYPE_SURFACE;
@@ -700,6 +701,12 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
       return videoFrameProcessor != null;
     }
 
+    @Override
+    public void redraw() {
+      checkState(isInitialized());
+      castNonNull(videoFrameProcessor).redraw();
+    }
+
     @Override
     public void flush(boolean resetPosition) {
       if (isInitialized()) {

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java

@@ -157,6 +157,9 @@ public interface VideoSink {
   /** Returns whether the video sink is {@linkplain #initialize(Format) initialized}. */
   boolean isInitialized();
 
+  /** Redraws the {@linkplain #setVideoEffects video effects} immediately. */
+  void redraw();
+
   /**
    * Flushes the video sink.
    *

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapperTest.java

@@ -151,6 +151,9 @@ public final class PlaybackVideoGraphWrapperTest {
       return null;
     }
 
+    @Override
+    public void redraw() {}
+
     @Override
     public void registerInputStream(
         @InputType int inputType, Format format, List<Effect> effects, long offsetToAddUs) {

libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java

@@ -126,6 +126,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     return isInitialized;
   }
 
+  @Override
+  public void redraw() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void flush(boolean resetPosition) {
     executeOrDelay(videoSink -> videoSink.flush(resetPosition));