Removed ExoPlayer specific states from SimpleBasePlayer

PiperOrigin-RevId: 492443147

Removed ExoPlayer specific states from SimpleBasePlayer
PiperOrigin-RevId: 492443147
08f6fe17 · michaelkatz · Ian Baker · c42fc6f3 · 08f6fe17 · 08f6fe17
Commit 08f6fe17 authored Dec 02, 2022 by michaelkatz Committed by Ian Baker Dec 12, 2022
Showing with 5 additions and 64 deletions
library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
library/common/src/test/java/com/google/android/exoplayer2/SimpleBasePlayerTest.java
--- a/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
@@ -121,8 +121,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
      private DeviceInfo deviceInfo;
      private int deviceVolume;
      private boolean isDeviceMuted;
-      private int audioSessionId;
-      private boolean skipSilenceEnabled;
      private Size surfaceSize;
      private boolean newlyRenderedFirstFrame;
      private Metadata timedMetadata;
@@ -167,8 +165,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
        deviceInfo = DeviceInfo.UNKNOWN;
        deviceVolume = 0;
        isDeviceMuted = false;
-        audioSessionId = C.AUDIO_SESSION_ID_UNSET;
-        skipSilenceEnabled = false;
        surfaceSize = Size.UNKNOWN;
        newlyRenderedFirstFrame = false;
        timedMetadata = new Metadata(/* presentationTimeUs= */ C.TIME_UNSET);
@@ -213,8 +209,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
        this.deviceInfo = state.deviceInfo;
        this.deviceVolume = state.deviceVolume;
        this.isDeviceMuted = state.isDeviceMuted;
-        this.audioSessionId = state.audioSessionId;
-        this.skipSilenceEnabled = state.skipSilenceEnabled;
        this.surfaceSize = state.surfaceSize;
        this.newlyRenderedFirstFrame = state.newlyRenderedFirstFrame;
        this.timedMetadata = state.timedMetadata;
@@ -501,30 +495,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
      }
      /**
-       * Sets the audio session id.
-       *
-       * @param audioSessionId The audio session id.
-       * @return This builder.
-       */
-      @CanIgnoreReturnValue
-      public Builder setAudioSessionId(int audioSessionId) {
-        this.audioSessionId = audioSessionId;
-        return this;
-      }
-      /**
-       * Sets whether skipping silences in the audio stream is enabled.
-       *
-       * @param skipSilenceEnabled Whether skipping silences in the audio stream is enabled.
-       * @return This builder.
-       */
-      @CanIgnoreReturnValue
-      public Builder setSkipSilenceEnabled(boolean skipSilenceEnabled) {
-        this.skipSilenceEnabled = skipSilenceEnabled;
-        return this;
-      }
-      /**
       * Sets the size of the surface onto which the video is being rendered.
       *
       * @param surfaceSize The surface size. Dimensions may be {@link C#LENGTH_UNSET} if unknown,
@@ -854,10 +824,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
    public final int deviceVolume;
    /** Whether the device is muted. */
    public final boolean isDeviceMuted;
-    /** The audio session id. */
-    public final int audioSessionId;
-    /** Whether skipping silences in the audio stream is enabled. */
-    public final boolean skipSilenceEnabled;
    /** The size of the surface onto which the video is being rendered. */
    public final Size surfaceSize;
    /**
@@ -998,8 +964,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
      this.deviceInfo = builder.deviceInfo;
      this.deviceVolume = builder.deviceVolume;
      this.isDeviceMuted = builder.isDeviceMuted;
-      this.audioSessionId = builder.audioSessionId;
-      this.skipSilenceEnabled = builder.skipSilenceEnabled;
      this.surfaceSize = builder.surfaceSize;
      this.newlyRenderedFirstFrame = builder.newlyRenderedFirstFrame;
      this.timedMetadata = builder.timedMetadata;
@@ -1055,8 +1019,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
          && deviceInfo.equals(state.deviceInfo)
          && deviceVolume == state.deviceVolume
          && isDeviceMuted == state.isDeviceMuted
-          && audioSessionId == state.audioSessionId
-          && skipSilenceEnabled == state.skipSilenceEnabled
          && surfaceSize.equals(state.surfaceSize)
          && newlyRenderedFirstFrame == state.newlyRenderedFirstFrame
          && timedMetadata.equals(state.timedMetadata)
@@ -1101,8 +1063,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
      result = 31 * result + deviceInfo.hashCode();
      result = 31 * result + deviceVolume;
      result = 31 * result + (isDeviceMuted ? 1 : 0);
-      result = 31 * result + audioSessionId;
-      result = 31 * result + (skipSilenceEnabled ? 1 : 0);
      result = 31 * result + surfaceSize.hashCode();
      result = 31 * result + (newlyRenderedFirstFrame ? 1 : 0);
      result = 31 * result + timedMetadata.hashCode();
@@ -3009,11 +2969,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
          Player.EVENT_PLAYBACK_PARAMETERS_CHANGED,
          listener -> listener.onPlaybackParametersChanged(newState.playbackParameters));
    }
-    if (previousState.skipSilenceEnabled != newState.skipSilenceEnabled) {
-      listeners.queueEvent(
-          Player.EVENT_SKIP_SILENCE_ENABLED_CHANGED,
-          listener -> listener.onSkipSilenceEnabledChanged(newState.skipSilenceEnabled));
-    }
    if (previousState.repeatMode != newState.repeatMode) {
      listeners.queueEvent(
          Player.EVENT_REPEAT_MODE_CHANGED,
@@ -3060,11 +3015,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
          Player.EVENT_PLAYLIST_METADATA_CHANGED,
          listener -> listener.onPlaylistMetadataChanged(newState.playlistMetadata));
    }
-    if (previousState.audioSessionId != newState.audioSessionId) {
-      listeners.queueEvent(
-          Player.EVENT_AUDIO_SESSION_ID,
-          listener -> listener.onAudioSessionIdChanged(newState.audioSessionId));
-    }
    if (newState.newlyRenderedFirstFrame) {
      listeners.queueEvent(Player.EVENT_RENDERED_FIRST_FRAME, Listener::onRenderedFirstFrame);
    }

--- a/library/common/src/test/java/com/google/android/exoplayer2/SimpleBasePlayerTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/SimpleBasePlayerTest.java
@@ -114,8 +114,6 @@ public class SimpleBasePlayerTest {
                new DeviceInfo(
                    DeviceInfo.PLAYBACK_TYPE_LOCAL, /* minVolume= */ 3, /* maxVolume= */ 7))
            .setIsDeviceMuted(true)
-            .setAudioSessionId(78)
-            .setSkipSilenceEnabled(true)
            .setSurfaceSize(new Size(480, 360))
            .setNewlyRenderedFirstFrame(true)
            .setTimedMetadata(new Metadata())
@@ -276,8 +274,6 @@ public class SimpleBasePlayerTest {
            .setDeviceInfo(deviceInfo)
            .setDeviceVolume(5)
            .setIsDeviceMuted(true)
-            .setAudioSessionId(78)
-            .setSkipSilenceEnabled(true)
            .setSurfaceSize(surfaceSize)
            .setNewlyRenderedFirstFrame(true)
            .setTimedMetadata(timedMetadata)
@@ -318,8 +314,6 @@ public class SimpleBasePlayerTest {
    assertThat(state.deviceInfo).isEqualTo(deviceInfo);
    assertThat(state.deviceVolume).isEqualTo(5);
    assertThat(state.isDeviceMuted).isTrue();
-    assertThat(state.audioSessionId).isEqualTo(78);
-    assertThat(state.skipSilenceEnabled).isTrue();
    assertThat(state.surfaceSize).isEqualTo(surfaceSize);
    assertThat(state.newlyRenderedFirstFrame).isTrue();
    assertThat(state.timedMetadata).isEqualTo(timedMetadata);
@@ -872,8 +866,6 @@ public class SimpleBasePlayerTest {
            .setDeviceInfo(deviceInfo)
            .setDeviceVolume(5)
            .setIsDeviceMuted(true)
-            .setAudioSessionId(78)
-            .setSkipSilenceEnabled(true)
            .setSurfaceSize(surfaceSize)
            .setPlaylist(playlist)
            .setPlaylistMetadata(playlistMetadata)
@@ -1167,8 +1159,6 @@ public class SimpleBasePlayerTest {
            .setDeviceInfo(deviceInfo)
            .setDeviceVolume(5)
            .setIsDeviceMuted(true)
-            .setAudioSessionId(78)
-            .setSkipSilenceEnabled(true)
            .setSurfaceSize(surfaceSize)
            .setNewlyRenderedFirstFrame(true)
            .setTimedMetadata(timedMetadata)
@@ -1234,11 +1224,9 @@ public class SimpleBasePlayerTest {
    verify(listener).onMediaMetadataChanged(mediaMetadata);
    verify(listener).onTracksChanged(tracks);
    verify(listener).onPlaylistMetadataChanged(playlistMetadata);
-    verify(listener).onAudioSessionIdChanged(78);
    verify(listener).onRenderedFirstFrame();
    verify(listener).onMetadata(timedMetadata);
    verify(listener).onSurfaceSizeChanged(surfaceSize.getWidth(), surfaceSize.getHeight());
-    verify(listener).onSkipSilenceEnabledChanged(true);
    verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
    verify(listener)
        .onPositionDiscontinuity(
@@ -1291,9 +1279,7 @@ public class SimpleBasePlayerTest {
                        Player.EVENT_MAX_SEEK_TO_PREVIOUS_POSITION_CHANGED,
                        Player.EVENT_TRACK_SELECTION_PARAMETERS_CHANGED,
                        Player.EVENT_AUDIO_ATTRIBUTES_CHANGED,
-                        Player.EVENT_AUDIO_SESSION_ID,
                        Player.EVENT_VOLUME_CHANGED,
-                        Player.EVENT_SKIP_SILENCE_ENABLED_CHANGED,
                        Player.EVENT_SURFACE_SIZE_CHANGED,
                        Player.EVENT_VIDEO_SIZE_CHANGED,
                        Player.EVENT_RENDERED_FIRST_FRAME,
@@ -1308,6 +1294,11 @@ public class SimpleBasePlayerTest {
      if (method.getName().equals("onSeekProcessed")) {
        continue;
      }
+      if (method.getName().equals("onAudioSessionIdChanged")
+          || method.getName().equals("onSkipSilenceEnabledChanged")) {
+        // Skip listeners for ExoPlayer-specific states
+        continue;
+      }
      method.invoke(verify(listener), getAnyArguments(method));
    }
  }