loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove method VideoFrameReleaseControl.onDisabled

Browse Source 
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
This commit is contained in:
kimvde 2025-03-03 02:39:48 -08:00 committed by Copybara-Service
parent 8ea49025aa
commit 1361d569cd
7 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java
View File

@ -86,11 +86,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
videoFrameReleaseControl.onEnabled(mayRenderStartOfStream); videoFrameReleaseControl.onEnabled(mayRenderStartOfStream);
} }
@Override
public void onRendererDisabled() {
videoFrameReleaseControl.onDisabled();
}
@Override @Override
public void onRendererStarted() { public void onRendererStarted() {
videoFrameReleaseControl.onStarted(); videoFrameReleaseControl.onStarted();

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
View File

@ -1029,11 +1029,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
protected void onDisabled() { protected void onDisabled() {
reportedVideoSize = null; reportedVideoSize = null;
periodDurationUs = C.TIME_UNSET; periodDurationUs = C.TIME_UNSET;
if (videoSink != null) {
videoSink.onRendererDisabled();
} else {
videoFrameReleaseControl.onDisabled();
}
maybeSetupTunnelingForFirstFrame(); maybeSetupTunnelingForFirstFrame();
haveReportedFirstFrameRenderedForCurrentSurface = false; haveReportedFirstFrameRenderedForCurrentSurface = false;
tunnelingOnFrameRenderedListener = null; tunnelingOnFrameRenderedListener = null;

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java
View File

@ -667,11 +667,6 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
defaultVideoSink.onRendererEnabled(mayRenderStartOfStream); defaultVideoSink.onRendererEnabled(mayRenderStartOfStream);
} }
@Override
public void onRendererDisabled() {
defaultVideoSink.onRendererDisabled();
}
@Override @Override
public void onRendererStarted() { public void onRendererStarted() {
defaultVideoSink.onRendererStarted(); defaultVideoSink.onRendererStarted();

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java
View File

@ -214,11 +214,6 @@ public final class VideoFrameReleaseControl {
: C.FIRST_FRAME_NOT_RENDERED_ONLY_ALLOWED_IF_STARTED; : 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. */ /** Called when the renderer is started. */
public void onStarted() { public void onStarted() {
started = true; started = true;

3
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java
View File

@ -128,9 +128,6 @@ public interface VideoSink {
/** Called when the {@link Renderer} currently feeding this sink is enabled. */ /** Called when the {@link Renderer} currently feeding this sink is enabled. */
void onRendererEnabled(boolean mayRenderStartOfStream); 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. */ /** Called when the {@link Renderer} currently feeding this sink is started. */
void onRendererStarted(); void onRendererStarted();

5
libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java
View File

@ -86,11 +86,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
executeOrDelay(videoSink -> videoSink.onRendererEnabled(mayRenderStartOfStream)); executeOrDelay(videoSink -> videoSink.onRendererEnabled(mayRenderStartOfStream));
} }
@Override
public void onRendererDisabled() {
executeOrDelay(VideoSink::onRendererDisabled);
}
@Override @Override
public void onRendererStarted() { public void onRendererStarted() {
executeOrDelay(VideoSink::onRendererStarted); executeOrDelay(VideoSink::onRendererStarted);

6
libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java
View File

@ -514,12 +514,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
videoSink.setListener(VideoSink.Listener.NO_OP, /* executor= */ (runnable) -> {}); videoSink.setListener(VideoSink.Listener.NO_OP, /* executor= */ (runnable) -> {});
} }
@Override
protected void onDisabled() {
super.onDisabled();
videoSink.onRendererDisabled();
}
@Override @Override
public boolean isEnded() { public boolean isEnded() {
return super.isEnded() return super.isEnded()