From 4e40a03ac9e2e80a97e609bd361f558b3102af19 Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 14 Jan 2021 16:51:55 +0000 Subject: [PATCH] Remove interface SimpleExoPlayer.VideoListener PiperOrigin-RevId: 351808884 --- RELEASENOTES.md | 2 ++ .../android/exoplayer2/SimpleExoPlayer.java | 18 +++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index b2febbf244..d635d88d34 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -62,6 +62,8 @@ application is calling `SimpleExoPlayer.setVideoListener(null)`, make sure to replace this call with `SimpleExoPlayer.removeVideoListener(VideoListener)`. + * `SimpleExoPlayer.VideoListener`. Use + `com.google.android.exoplayer2.video.VideoListener` instead. * `SingleSampleMediaSource.EventListener` and constructors. Use `MediaSourceEventListener` and `SingleSampleMediaSource.Factory` instead. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index ca7313f47b..5e6b7a5e01 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -63,6 +63,7 @@ import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView; import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer; import com.google.android.exoplayer2.video.VideoFrameMetadataListener; +import com.google.android.exoplayer2.video.VideoListener; import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import java.util.ArrayList; @@ -86,10 +87,6 @@ public class SimpleExoPlayer extends BasePlayer /** The default timeout for detaching a surface from the player, in milliseconds. */ public static final long DEFAULT_DETACH_SURFACE_TIMEOUT_MS = 2_000; - /** @deprecated Use {@link com.google.android.exoplayer2.video.VideoListener}. */ - @Deprecated - public interface VideoListener extends com.google.android.exoplayer2.video.VideoListener {} - /** * A builder for {@link SimpleExoPlayer} instances. * @@ -572,8 +569,7 @@ public class SimpleExoPlayer extends BasePlayer private final Context applicationContext; private final ExoPlayerImpl player; private final ComponentListener componentListener; - private final CopyOnWriteArraySet - videoListeners; + private final CopyOnWriteArraySet videoListeners; private final CopyOnWriteArraySet audioListeners; private final CopyOnWriteArraySet textOutputs; private final CopyOnWriteArraySet metadataOutputs; @@ -1120,14 +1116,14 @@ public class SimpleExoPlayer extends BasePlayer } @Override - public void addVideoListener(com.google.android.exoplayer2.video.VideoListener listener) { + public void addVideoListener(VideoListener listener) { // Don't verify application thread. We allow calls to this method from any thread. Assertions.checkNotNull(listener); videoListeners.add(listener); } @Override - public void removeVideoListener(com.google.android.exoplayer2.video.VideoListener listener) { + public void removeVideoListener(VideoListener listener) { // Don't verify application thread. We allow calls to this method from any thread. videoListeners.remove(listener); } @@ -1943,7 +1939,7 @@ public class SimpleExoPlayer extends BasePlayer if (width != surfaceWidth || height != surfaceHeight) { surfaceWidth = width; surfaceHeight = height; - for (com.google.android.exoplayer2.video.VideoListener videoListener : videoListeners) { + for (VideoListener videoListener : videoListeners) { videoListener.onSurfaceSizeChanged(width, height); } } @@ -2119,7 +2115,7 @@ public class SimpleExoPlayer extends BasePlayer @Override public void onVideoSizeChanged( int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) { - for (com.google.android.exoplayer2.video.VideoListener videoListener : videoListeners) { + for (VideoListener videoListener : videoListeners) { // Prevent duplicate notification if a listener is both a VideoRendererEventListener and // a VideoListener, as they have the same method signature. if (!videoDebugListeners.contains(videoListener)) { @@ -2136,7 +2132,7 @@ public class SimpleExoPlayer extends BasePlayer @Override public void onRenderedFirstFrame(Surface surface) { if (SimpleExoPlayer.this.surface == surface) { - for (com.google.android.exoplayer2.video.VideoListener videoListener : videoListeners) { + for (VideoListener videoListener : videoListeners) { videoListener.onRenderedFirstFrame(); } }