loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-12 01:59:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove interface SimpleExoPlayer.VideoListener

Browse Source 
PiperOrigin-RevId: 351808884
This commit is contained in:
christosts 2021-01-14 16:51:55 +00:00 committed by Ian Baker
parent d9e0b91be7
commit 4e40a03ac9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -62,6 +62,8 @@
application is calling `SimpleExoPlayer.setVideoListener(null)`, application is calling `SimpleExoPlayer.setVideoListener(null)`,
make sure to replace this call with make sure to replace this call with
`SimpleExoPlayer.removeVideoListener(VideoListener)`. `SimpleExoPlayer.removeVideoListener(VideoListener)`.
* `SimpleExoPlayer.VideoListener`. Use
`com.google.android.exoplayer2.video.VideoListener` instead.
* `SingleSampleMediaSource.EventListener` and constructors. Use * `SingleSampleMediaSource.EventListener` and constructors. Use
`MediaSourceEventListener` and `SingleSampleMediaSource.Factory` `MediaSourceEventListener` and `SingleSampleMediaSource.Factory`
instead. instead.

18
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View File

@ -63,6 +63,7 @@ import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView; import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView;
import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer; import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; 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.VideoRendererEventListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.util.ArrayList; 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. */ /** The default timeout for detaching a surface from the player, in milliseconds. */
public static final long DEFAULT_DETACH_SURFACE_TIMEOUT_MS = 2_000; 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. * A builder for {@link SimpleExoPlayer} instances.
* *
@ -572,8 +569,7 @@ public class SimpleExoPlayer extends BasePlayer
private final Context applicationContext; private final Context applicationContext;
private final ExoPlayerImpl player; private final ExoPlayerImpl player;
private final ComponentListener componentListener; private final ComponentListener componentListener;
private final CopyOnWriteArraySet<com.google.android.exoplayer2.video.VideoListener> private final CopyOnWriteArraySet<VideoListener> videoListeners;
videoListeners;
private final CopyOnWriteArraySet<AudioListener> audioListeners; private final CopyOnWriteArraySet<AudioListener> audioListeners;
private final CopyOnWriteArraySet<TextOutput> textOutputs; private final CopyOnWriteArraySet<TextOutput> textOutputs;
private final CopyOnWriteArraySet<MetadataOutput> metadataOutputs; private final CopyOnWriteArraySet<MetadataOutput> metadataOutputs;
@ -1120,14 +1116,14 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @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. // Don't verify application thread. We allow calls to this method from any thread.
Assertions.checkNotNull(listener); Assertions.checkNotNull(listener);
videoListeners.add(listener); videoListeners.add(listener);
} }
@Override @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. // Don't verify application thread. We allow calls to this method from any thread.
videoListeners.remove(listener); videoListeners.remove(listener);
} }
@ -1943,7 +1939,7 @@ public class SimpleExoPlayer extends BasePlayer
if (width != surfaceWidth || height != surfaceHeight) { if (width != surfaceWidth || height != surfaceHeight) {
surfaceWidth = width; surfaceWidth = width;
surfaceHeight = height; surfaceHeight = height;
for (com.google.android.exoplayer2.video.VideoListener videoListener : videoListeners) { for (VideoListener videoListener : videoListeners) {
videoListener.onSurfaceSizeChanged(width, height); videoListener.onSurfaceSizeChanged(width, height);
} }
} }
@ -2119,7 +2115,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void onVideoSizeChanged( public void onVideoSizeChanged(
int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) { 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 // Prevent duplicate notification if a listener is both a VideoRendererEventListener and
// a VideoListener, as they have the same method signature. // a VideoListener, as they have the same method signature.
if (!videoDebugListeners.contains(videoListener)) { if (!videoDebugListeners.contains(videoListener)) {
@ -2136,7 +2132,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void onRenderedFirstFrame(Surface surface) { public void onRenderedFirstFrame(Surface surface) {
if (SimpleExoPlayer.this.surface == surface) { if (SimpleExoPlayer.this.surface == surface) {
for (com.google.android.exoplayer2.video.VideoListener videoListener : videoListeners) { for (VideoListener videoListener : videoListeners) {
videoListener.onRenderedFirstFrame(); videoListener.onRenderedFirstFrame();
} }
} }