Remove deprecated methods from SimpleExoPlayer

Remove methods:
- SimpleExoPlayer.setPlaybackParams, deprecated since r2.4.0.
- SimpleExoPlayer.setAudioStreamType, deprecated since r2.5.0.
- SimpleExoPlayer.getAudioStreamType, deprecated since r2.5.0.

PiperOrigin-RevId: 351570070
This commit is contained in:
christosts 2021-01-13 14:05:19 +00:00 committed by Ian Baker
parent dde0b9b614
commit bdc2a4e3af
2 changed files with 6 additions and 52 deletions

View File

@ -22,9 +22,15 @@
`PlayerView.setShowBuffering(int)` instead. `PlayerView.setShowBuffering(int)` instead.
* `SimpleExoPlayer.clearVideoListener()`. Use * `SimpleExoPlayer.clearVideoListener()`. Use
`SimpleExoPlayer.removeVideoListener(VideoListener)` instead. `SimpleExoPlayer.removeVideoListener(VideoListener)` instead.
* `SimpleExoPlayer.getAudioStreamType()`. Use
`SimpleExoPlayer.getAudioAttributes()` instead.
* `SimpleExoPlayer.setAudioDebugListener(AudioRendererEventListener)`. * `SimpleExoPlayer.setAudioDebugListener(AudioRendererEventListener)`.
Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)` Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)`
instead. instead.
* `SimpleExoPlayer.setAudioStreamType(int)`. Use
`SimpleExoPlayer.setAudioAttributes(AudioAttributes)` instead.
* `SimpleExoPlayer.setPlaybackParams(PlaybackParams)`. Use
`SimpleExoPlayer.setPlaybackParameters(PlaybackParameters)` instead.
* `SimpleExoPlayer.setVideoDebugListener(VideoRendererEventListener)`. * `SimpleExoPlayer.setVideoDebugListener(VideoRendererEventListener)`.
Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)` Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)`
instead. instead.

View File

@ -21,7 +21,6 @@ import android.graphics.SurfaceTexture;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.PlaybackParams;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.view.Surface; import android.view.Surface;
@ -29,7 +28,6 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.TextureView; import android.view.TextureView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
@ -1041,37 +1039,6 @@ public class SimpleExoPlayer extends BasePlayer
notifySkipSilenceEnabledChanged(); notifySkipSilenceEnabledChanged();
} }
/**
* Sets the stream type for audio playback, used by the underlying audio track.
*
* <p>Setting the stream type during playback may introduce a short gap in audio output as the
* audio track is recreated.
*
* <p>Calling this method overwrites any attributes set previously by calling {@link
* #setAudioAttributes(AudioAttributes)}.
*
* @deprecated Use {@link #setAudioAttributes(AudioAttributes)}.
* @param streamType The stream type for audio playback.
*/
@Deprecated
public void setAudioStreamType(@C.StreamType int streamType) {
@C.AudioUsage int usage = Util.getAudioUsageForStreamType(streamType);
@C.AudioContentType int contentType = Util.getAudioContentTypeForStreamType(streamType);
AudioAttributes audioAttributes =
new AudioAttributes.Builder().setUsage(usage).setContentType(contentType).build();
setAudioAttributes(audioAttributes);
}
/**
* Returns the stream type for audio playback.
*
* @deprecated Use {@link #getAudioAttributes()}.
*/
@Deprecated
public @C.StreamType int getAudioStreamType() {
return Util.getStreamTypeForAudioUsage(audioAttributes.usage);
}
/** Returns the {@link AnalyticsCollector} used for collecting analytics events. */ /** Returns the {@link AnalyticsCollector} used for collecting analytics events. */
public AnalyticsCollector getAnalyticsCollector() { public AnalyticsCollector getAnalyticsCollector() {
return analyticsCollector; return analyticsCollector;
@ -1142,25 +1109,6 @@ public class SimpleExoPlayer extends BasePlayer
this.priorityTaskManager = priorityTaskManager; this.priorityTaskManager = priorityTaskManager;
} }
/**
* Sets the {@link PlaybackParams} governing audio playback.
*
* @param params The {@link PlaybackParams}, or null to clear any previously set parameters.
* @deprecated Use {@link #setPlaybackParameters(PlaybackParameters)}.
*/
@Deprecated
@RequiresApi(23)
public void setPlaybackParams(@Nullable PlaybackParams params) {
PlaybackParameters playbackParameters;
if (params != null) {
params.allowDefaults();
playbackParameters = new PlaybackParameters(params.getSpeed(), params.getPitch());
} else {
playbackParameters = null;
}
setPlaybackParameters(playbackParameters);
}
/** Returns the video format currently being played, or null if no video is being played. */ /** Returns the video format currently being played, or null if no video is being played. */
@Nullable @Nullable
public Format getVideoFormat() { public Format getVideoFormat() {