From 18e9a3fe36ed21247066eaacde4bac035f3ffe57 Mon Sep 17 00:00:00 2001 From: kimvde Date: Thu, 3 Apr 2025 03:41:13 -0700 Subject: [PATCH] Rename VideoSink.onStarted/Stopped start/stopRendering better reflects what the method does. PiperOrigin-RevId: 743493973 --- .../media3/exoplayer/video/DefaultVideoSink.java | 4 ++-- .../exoplayer/video/MediaCodecVideoRenderer.java | 4 ++-- .../video/PlaybackVideoGraphWrapper.java | 8 ++++---- .../media3/exoplayer/video/VideoSink.java | 12 ++++++------ .../media3/transformer/BufferingVideoSink.java | 8 ++++---- .../transformer/SequenceRenderersFactory.java | 4 ++-- .../transformer/BufferingVideoSinkTest.java | 16 ++++++++-------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java index f5596b42f0..a653cce23c 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java @@ -78,12 +78,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } @Override - public void onStarted() { + public void startRendering() { videoFrameReleaseControl.onStarted(); } @Override - public void onStopped() { + public void stopRendering() { videoFrameReleaseControl.onStopped(); } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java index 442c52eed6..6f91ffb463 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java @@ -1058,7 +1058,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer totalVideoFrameProcessingOffsetUs = 0; videoFrameProcessingOffsetCount = 0; if (videoSink != null) { - videoSink.onStarted(); + videoSink.startRendering(); } else { videoFrameReleaseControl.onStarted(); } @@ -1069,7 +1069,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer maybeNotifyDroppedFrames(); maybeNotifyVideoFrameProcessingOffset(); if (videoSink != null) { - videoSink.onStopped(); + videoSink.stopRendering(); } else { videoFrameReleaseControl.onStopped(); } 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 d37a13f03f..74936e71ef 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 @@ -701,13 +701,13 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video } @Override - public void onStarted() { - defaultVideoSink.onStarted(); + public void startRendering() { + defaultVideoSink.startRendering(); } @Override - public void onStopped() { - defaultVideoSink.onStopped(); + public void stopRendering() { + defaultVideoSink.stopRendering(); } @Override diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java index 8c3bff6f1d..2acb03f55d 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java @@ -139,11 +139,11 @@ public interface VideoSink { */ int RELEASE_FIRST_FRAME_WHEN_PREVIOUS_STREAM_PROCESSED = 2; - /** Called when rendering starts. */ - void onStarted(); + /** Starts rendering to the output surface. */ + void startRendering(); - /** Called when rendering stops. */ - void onStopped(); + /** Stops rendering to the output surface. */ + void stopRendering(); /** * Sets a {@link Listener} on this sink. Callbacks are triggered on the supplied {@link Executor}. @@ -263,8 +263,8 @@ public interface VideoSink { List videoEffects); /** - * Allows the sink to release the first frame even if rendering is not {@linkplain #onStarted() - * started}. + * Allows the sink to release the first frame even if rendering is not {@linkplain + * #startRendering() started}. * *

This is used to update the {@link FirstFrameReleaseInstruction} of the {@linkplain * #onInputStreamChanged(int, Format, long, int, List) stream} that is currently being processed. diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java b/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java index a0882624ae..7d7b3910e7 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java @@ -81,13 +81,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } @Override - public void onStarted() { - executeOrDelay(VideoSink::onStarted); + public void startRendering() { + executeOrDelay(VideoSink::startRendering); } @Override - public void onStopped() { - executeOrDelay(VideoSink::onStopped); + public void stopRendering() { + executeOrDelay(VideoSink::stopRendering); } @Override diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java index 84926b5e52..44a0a9df76 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java @@ -576,7 +576,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @Override protected void onStarted() throws ExoPlaybackException { super.onStarted(); - videoSink.onStarted(); + videoSink.startRendering(); } @Override @@ -595,7 +595,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @Override protected void onStopped() { super.onStopped(); - videoSink.onStopped(); + videoSink.stopRendering(); } @Override diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/BufferingVideoSinkTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/BufferingVideoSinkTest.java index c3fa6007cc..c0b171257e 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/BufferingVideoSinkTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/BufferingVideoSinkTest.java @@ -40,11 +40,11 @@ public class BufferingVideoSinkTest { VideoSink videoSinkMock = mock(VideoSink.class); bufferingVideoSink.setVideoSink(videoSinkMock); - bufferingVideoSink.onStarted(); + bufferingVideoSink.startRendering(); bufferingVideoSink.flush(/* resetPosition= */ true); InOrder inOrder = Mockito.inOrder(videoSinkMock); - inOrder.verify(videoSinkMock).onStarted(); + inOrder.verify(videoSinkMock).startRendering(); inOrder.verify(videoSinkMock).flush(/* resetPosition= */ true); } @@ -52,12 +52,12 @@ public class BufferingVideoSinkTest { public void setVideoSink_executesPendingOperations() { BufferingVideoSink bufferingVideoSink = new BufferingVideoSink(context); VideoSink videoSinkMock = mock(VideoSink.class); - bufferingVideoSink.onStarted(); + bufferingVideoSink.startRendering(); bufferingVideoSink.flush(/* resetPosition= */ true); bufferingVideoSink.setVideoSink(videoSinkMock); InOrder inOrder = Mockito.inOrder(videoSinkMock); - inOrder.verify(videoSinkMock).onStarted(); + inOrder.verify(videoSinkMock).startRendering(); inOrder.verify(videoSinkMock).flush(/* resetPosition= */ true); } @@ -68,10 +68,10 @@ public class BufferingVideoSinkTest { bufferingVideoSink.setVideoSink(videoSinkMock); bufferingVideoSink.setVideoSink(null); - bufferingVideoSink.onStarted(); + bufferingVideoSink.startRendering(); bufferingVideoSink.flush(/* resetPosition= */ true); - verify(videoSinkMock, never()).onStarted(); + verify(videoSinkMock, never()).startRendering(); verify(videoSinkMock, never()).flush(/* resetPosition= */ true); } @@ -80,12 +80,12 @@ public class BufferingVideoSinkTest { BufferingVideoSink bufferingVideoSink = new BufferingVideoSink(context); VideoSink videoSinkMock = mock(VideoSink.class); - bufferingVideoSink.onStarted(); + bufferingVideoSink.startRendering(); bufferingVideoSink.flush(/* resetPosition= */ true); bufferingVideoSink.clearPendingOperations(); bufferingVideoSink.setVideoSink(videoSinkMock); - verify(videoSinkMock, never()).onStarted(); + verify(videoSinkMock, never()).startRendering(); verify(videoSinkMock, never()).flush(/* resetPosition= */ true); } }