From 288899ee9d57926f02b3acff720c1359eb0860c6 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Fri, 29 Oct 2021 14:35:53 +0000 Subject: [PATCH] Change Transformer to use Player.Listener. AnalyticsListener should not be used for non-analytical actions. PiperOrigin-RevId: 406355758 --- .../transformer/TranscodingTransformer.java | 18 ++++++++---------- .../exoplayer2/transformer/Transformer.java | 17 ++++++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java index d766987aa8..6f58812be4 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java @@ -45,7 +45,6 @@ import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.TracksInfo; -import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor; @@ -573,8 +572,7 @@ public final class TranscodingTransformer { .setClock(clock) .build(); player.setMediaItem(mediaItem); - player.addAnalyticsListener( - new TranscodingTransformerAnalyticsListener(mediaItem, muxerWrapper)); + player.addListener(new TranscodingTransformerPlayerListener(mediaItem, muxerWrapper)); player.prepare(); progressState = PROGRESS_STATE_WAITING_FOR_AVAILABILITY; @@ -688,30 +686,30 @@ public final class TranscodingTransformer { } } - private final class TranscodingTransformerAnalyticsListener implements AnalyticsListener { + private final class TranscodingTransformerPlayerListener implements Player.Listener { private final MediaItem mediaItem; private final MuxerWrapper muxerWrapper; - public TranscodingTransformerAnalyticsListener(MediaItem mediaItem, MuxerWrapper muxerWrapper) { + public TranscodingTransformerPlayerListener(MediaItem mediaItem, MuxerWrapper muxerWrapper) { this.mediaItem = mediaItem; this.muxerWrapper = muxerWrapper; } @Override - public void onPlaybackStateChanged(EventTime eventTime, int state) { + public void onPlaybackStateChanged(int state) { if (state == Player.STATE_ENDED) { handleTransformationEnded(/* exception= */ null); } } @Override - public void onTimelineChanged(EventTime eventTime, int reason) { + public void onTimelineChanged(Timeline timeline, int reason) { if (progressState != PROGRESS_STATE_WAITING_FOR_AVAILABILITY) { return; } Timeline.Window window = new Timeline.Window(); - eventTime.timeline.getWindow(/* windowIndex= */ 0, window); + timeline.getWindow(/* windowIndex= */ 0, window); if (!window.isPlaceholder) { long durationUs = window.durationUs; // Make progress permanently unavailable if the duration is unknown, so that it doesn't jump @@ -726,7 +724,7 @@ public final class TranscodingTransformer { } @Override - public void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) { + public void onTracksInfoChanged(TracksInfo tracksInfo) { if (muxerWrapper.getTrackCount() == 0) { handleTransformationEnded( new IllegalStateException( @@ -736,7 +734,7 @@ public final class TranscodingTransformer { } @Override - public void onPlayerError(EventTime eventTime, PlaybackException error) { + public void onPlayerError(PlaybackException error) { handleTransformationEnded(error); } diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java index 1a79061f66..0fd763ad26 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java @@ -46,7 +46,6 @@ import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.TracksInfo; -import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor; @@ -496,7 +495,7 @@ public final class Transformer { .setClock(clock) .build(); player.setMediaItem(mediaItem); - player.addAnalyticsListener(new TransformerAnalyticsListener(mediaItem, muxerWrapper)); + player.addListener(new TransformerPlayerListener(mediaItem, muxerWrapper)); player.prepare(); progressState = PROGRESS_STATE_WAITING_FOR_AVAILABILITY; @@ -606,30 +605,30 @@ public final class Transformer { } } - private final class TransformerAnalyticsListener implements AnalyticsListener { + private final class TransformerPlayerListener implements Player.Listener { private final MediaItem mediaItem; private final MuxerWrapper muxerWrapper; - public TransformerAnalyticsListener(MediaItem mediaItem, MuxerWrapper muxerWrapper) { + public TransformerPlayerListener(MediaItem mediaItem, MuxerWrapper muxerWrapper) { this.mediaItem = mediaItem; this.muxerWrapper = muxerWrapper; } @Override - public void onPlaybackStateChanged(EventTime eventTime, int state) { + public void onPlaybackStateChanged(int state) { if (state == Player.STATE_ENDED) { handleTransformationEnded(/* exception= */ null); } } @Override - public void onTimelineChanged(EventTime eventTime, int reason) { + public void onTimelineChanged(Timeline timeline, int reason) { if (progressState != PROGRESS_STATE_WAITING_FOR_AVAILABILITY) { return; } Timeline.Window window = new Timeline.Window(); - eventTime.timeline.getWindow(/* windowIndex= */ 0, window); + timeline.getWindow(/* windowIndex= */ 0, window); if (!window.isPlaceholder) { long durationUs = window.durationUs; // Make progress permanently unavailable if the duration is unknown, so that it doesn't jump @@ -644,7 +643,7 @@ public final class Transformer { } @Override - public void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) { + public void onTracksInfoChanged(TracksInfo tracksInfo) { if (muxerWrapper.getTrackCount() == 0) { handleTransformationEnded( new IllegalStateException( @@ -654,7 +653,7 @@ public final class Transformer { } @Override - public void onPlayerError(EventTime eventTime, PlaybackException error) { + public void onPlayerError(PlaybackException error) { handleTransformationEnded(error); }