Skip to content

Commit

Permalink
Removed ExoPlayer specific states from SimpleBasePlayer
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 492443147
  • Loading branch information
@microkatz @icbaker
microkatz authored and icbaker committed Dec 12, 2022
1 parent c42fc6f commit 08f6fe1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 64 deletions.
50 changes: 0 additions & 50 deletions library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ public static final class Builder {
private DeviceInfo deviceInfo;
private int deviceVolume;
private boolean isDeviceMuted;
private int audioSessionId;
private boolean skipSilenceEnabled;
private Size surfaceSize;
private boolean newlyRenderedFirstFrame;
private Metadata timedMetadata;
Expand Down Expand Up @@ -167,8 +165,6 @@ public Builder() {
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);
Expand Down Expand Up @@ -213,8 +209,6 @@ private Builder(State state) {
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;
Expand Down Expand Up @@ -500,30 +494,6 @@ public Builder setIsDeviceMuted(boolean isDeviceMuted) {
return this;
}

/**
* 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.
*
Expand Down Expand Up @@ -854,10 +824,6 @@ public State build() {
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;
/**
Expand Down Expand Up @@ -998,8 +964,6 @@ private State(Builder builder) {
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;
Expand Down Expand Up @@ -1055,8 +1019,6 @@ public boolean equals(@Nullable Object o) {
&& 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)
Expand Down Expand Up @@ -1101,8 +1063,6 @@ public int hashCode() {
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();
Expand Down Expand Up @@ -3009,11 +2969,6 @@ private void updateStateAndInformListeners(State newState) {
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,
Expand Down Expand Up @@ -3060,11 +3015,6 @@ private void updateStateAndInformListeners(State newState) {
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);
}
Expand Down
19 changes: 5 additions & 14 deletions library/common/src/test/java/com/google/android/exoplayer2/SimpleBasePlayerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ public void stateBuildUpon_build_isEqual() {
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())
Expand Down Expand Up @@ -276,8 +274,6 @@ public void stateBuilderBuild_setsCorrectValues() {
.setDeviceInfo(deviceInfo)
.setDeviceVolume(5)
.setIsDeviceMuted(true)
.setAudioSessionId(78)
.setSkipSilenceEnabled(true)
.setSurfaceSize(surfaceSize)
.setNewlyRenderedFirstFrame(true)
.setTimedMetadata(timedMetadata)
Expand Down Expand Up @@ -318,8 +314,6 @@ public void stateBuilderBuild_setsCorrectValues() {
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);
Expand Down Expand Up @@ -872,8 +866,6 @@ public void getterMethods_noOtherMethodCalls_returnCurrentState() {
.setDeviceInfo(deviceInfo)
.setDeviceVolume(5)
.setIsDeviceMuted(true)
.setAudioSessionId(78)
.setSkipSilenceEnabled(true)
.setSurfaceSize(surfaceSize)
.setPlaylist(playlist)
.setPlaylistMetadata(playlistMetadata)
Expand Down Expand Up @@ -1167,8 +1159,6 @@ public void invalidateState_updatesStateAndInformsListeners() throws Exception {
.setDeviceInfo(deviceInfo)
.setDeviceVolume(5)
.setIsDeviceMuted(true)
.setAudioSessionId(78)
.setSkipSilenceEnabled(true)
.setSurfaceSize(surfaceSize)
.setNewlyRenderedFirstFrame(true)
.setTimedMetadata(timedMetadata)
Expand Down Expand Up @@ -1234,11 +1224,9 @@ protected State getState() {
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(
Expand Down Expand Up @@ -1291,9 +1279,7 @@ protected State getState() {
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,
Expand All @@ -1308,6 +1294,11 @@ protected State getState() {
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));
}
}
Expand Down

0 comments on commit 08f6fe1

Please sign in to comment.