From 8d0b82dfc352834e1b19d8ca48927355a064c00e Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 7 Oct 2024 06:59:33 -0700 Subject: [PATCH] PlaybackVideoGraphWrapper: rename VideoSinkImpl to InputVideoSink PlaybackVideoGraphWrapper will soon contain an input and an output video sink, as the rendering of the VideoGraph output frames will be handled by a DefaultVideoSink instance. PiperOrigin-RevId: 683167795 --- .../exoplayer/video/PlaybackVideoGraphWrapper.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java index a461a02332..17eb925648 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java @@ -227,7 +227,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video private static final Executor NO_OP_EXECUTOR = runnable -> {}; private final Context context; - private final VideoSinkImpl videoSinkImpl; + private final InputVideoSink inputVideoSink; private final VideoFrameReleaseControl videoFrameReleaseControl; private final VideoFrameRenderControl videoFrameRenderControl; private final PreviewingVideoGraph.Factory previewingVideoGraphFactory; @@ -253,7 +253,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video private PlaybackVideoGraphWrapper(Builder builder) { context = builder.context; - videoSinkImpl = new VideoSinkImpl(context); + inputVideoSink = new InputVideoSink(context); clock = builder.clock; videoFrameReleaseControl = builder.videoFrameReleaseControl; videoFrameReleaseControl.setClock(clock); @@ -263,7 +263,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video compositionEffects = builder.compositionEffects; listeners = new CopyOnWriteArraySet<>(); state = STATE_CREATED; - addListener(videoSinkImpl); + addListener(inputVideoSink); } /** @@ -288,7 +288,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video @Override public VideoSink getSink() { - return videoSinkImpl; + return inputVideoSink; } @Override @@ -483,7 +483,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video } /** Receives input from an ExoPlayer renderer and forwards it to the video graph. */ - private final class VideoSinkImpl implements VideoSink, PlaybackVideoGraphWrapper.Listener { + private final class InputVideoSink implements VideoSink, PlaybackVideoGraphWrapper.Listener { private final int videoFrameProcessorMaxPendingFrameCount; private final ArrayList videoEffects; @@ -513,7 +513,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video private Executor listenerExecutor; /** Creates a new instance. */ - public VideoSinkImpl(Context context) { + public InputVideoSink(Context context) { // TODO b/226330223 - Investigate increasing frame count when frame dropping is allowed. // TODO b/278234847 - Evaluate whether limiting frame count when frame dropping is not allowed // reduces decoder timeouts, and consider restoring. @@ -527,8 +527,6 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video listenerExecutor = NO_OP_EXECUTOR; } - // VideoSink impl - @Override public void onRendererEnabled(boolean mayRenderStartOfStream) { videoFrameReleaseControl.onEnabled(mayRenderStartOfStream);