From 1361d569cd133802cec833b68431e37acbfcc1f5 Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 3 Mar 2025 02:39:48 -0800 Subject: [PATCH] Remove method VideoFrameReleaseControl.onDisabled This method didn't have any effect because onEnabled, which also sets the firstFrameState, should always be the next method being called. PiperOrigin-RevId: 732846722 --- .../androidx/media3/exoplayer/video/DefaultVideoSink.java | 5 ----- .../media3/exoplayer/video/MediaCodecVideoRenderer.java | 5 ----- .../media3/exoplayer/video/PlaybackVideoGraphWrapper.java | 5 ----- .../media3/exoplayer/video/VideoFrameReleaseControl.java | 5 ----- .../java/androidx/media3/exoplayer/video/VideoSink.java | 3 --- .../androidx/media3/transformer/BufferingVideoSink.java | 5 ----- .../media3/transformer/SequenceRenderersFactory.java | 6 ------ 7 files changed, 34 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 f713c2d0b3..81d3cc0cda 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 @@ -86,11 +86,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; videoFrameReleaseControl.onEnabled(mayRenderStartOfStream); } - @Override - public void onRendererDisabled() { - videoFrameReleaseControl.onDisabled(); - } - @Override public void onRendererStarted() { videoFrameReleaseControl.onStarted(); 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 b576ae59f4..0f1bcb5b07 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 @@ -1029,11 +1029,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer protected void onDisabled() { reportedVideoSize = null; periodDurationUs = C.TIME_UNSET; - if (videoSink != null) { - videoSink.onRendererDisabled(); - } else { - videoFrameReleaseControl.onDisabled(); - } maybeSetupTunnelingForFirstFrame(); haveReportedFirstFrameRenderedForCurrentSurface = false; tunnelingOnFrameRenderedListener = null; 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 f29f2a5c24..5f34a4c0a4 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 @@ -667,11 +667,6 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video defaultVideoSink.onRendererEnabled(mayRenderStartOfStream); } - @Override - public void onRendererDisabled() { - defaultVideoSink.onRendererDisabled(); - } - @Override public void onRendererStarted() { defaultVideoSink.onRendererStarted(); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java index ff9e88e523..5656d2108e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java @@ -214,11 +214,6 @@ public final class VideoFrameReleaseControl { : C.FIRST_FRAME_NOT_RENDERED_ONLY_ALLOWED_IF_STARTED; } - /** Called when the renderer is disabled. */ - public void onDisabled() { - lowerFirstFrameState(C.FIRST_FRAME_NOT_RENDERED_ONLY_ALLOWED_IF_STARTED); - } - /** Called when the renderer is started. */ public void onStarted() { started = true; 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 9b6a3a85ec..af46c2cb04 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 @@ -128,9 +128,6 @@ public interface VideoSink { /** Called when the {@link Renderer} currently feeding this sink is enabled. */ void onRendererEnabled(boolean mayRenderStartOfStream); - /** Called when the {@link Renderer} currently feeding this sink is disabled. */ - void onRendererDisabled(); - /** Called when the {@link Renderer} currently feeding this sink is started. */ void onRendererStarted(); 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 2993137e3c..fd906783e9 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java @@ -86,11 +86,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; executeOrDelay(videoSink -> videoSink.onRendererEnabled(mayRenderStartOfStream)); } - @Override - public void onRendererDisabled() { - executeOrDelay(VideoSink::onRendererDisabled); - } - @Override public void onRendererStarted() { executeOrDelay(VideoSink::onRendererStarted); 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 9c7dd9b8ed..df1d92a372 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java @@ -514,12 +514,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; videoSink.setListener(VideoSink.Listener.NO_OP, /* executor= */ (runnable) -> {}); } - @Override - protected void onDisabled() { - super.onDisabled(); - videoSink.onRendererDisabled(); - } - @Override public boolean isEnded() { return super.isEnded()