Skip to content

SDK / exoplayer

Go to a project
Commit 10b4e10f by kimvde Committed by Christos Tsilopoulos
Options

Move SimpleExoPlayer.Builder to ExoPlayer 

- Remove ExoPlayer.Builder
- Copy SimpleExoPlayer.Builder to ExoPlayer
- Deprecate SimpleExoPlayer.Builder

PiperOrigin-RevId: 389890299
parent f5d8c211
Inline Side-by-side
Showing with 357 additions and 422 deletions
RELEASENOTES.md
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Core Library: * Core Library:
* Move `com.google.android.exoplayer2.device.DeviceInfo` to * Move `com.google.android.exoplayer2.device.DeviceInfo` to
`com.google.android.exoplayer2.DeviceInfo`. `com.google.android.exoplayer2.DeviceInfo`.
* Make `ExoPlayer.Builder` return a `SimpleExoPlayer` instance.
* Deprecate `SimpleExoPlayer.Builder`. Use `ExoPlayer.Builder` instead.
* Android 12 compatibility: * Android 12 compatibility:
* Disable platform transcoding when playing content URIs on Android 12. * Disable platform transcoding when playing content URIs on Android 12.
* Add `ExoPlayer.setVideoChangeFrameRateStrategy` to allow disabling of * Add `ExoPlayer.setVideoChangeFrameRateStrategy` to allow disabling of
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
...@@ -23,6 +23,7 @@ import android.view.Surface; ...@@ -23,6 +23,7 @@ import android.view.Surface;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.TextureView; import android.view.TextureView;
import androidx.annotation.IntRange;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
...@@ -33,6 +34,8 @@ import com.google.android.exoplayer2.audio.AudioSink; ...@@ -33,6 +34,8 @@ import com.google.android.exoplayer2.audio.AudioSink;
import com.google.android.exoplayer2.audio.AuxEffectInfo; import com.google.android.exoplayer2.audio.AuxEffectInfo;
import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.audio.DefaultAudioSink;
import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer; import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.extractor.ExtractorsFactory;
import com.google.android.exoplayer2.metadata.MetadataOutput; import com.google.android.exoplayer2.metadata.MetadataOutput;
import com.google.android.exoplayer2.metadata.MetadataRenderer; import com.google.android.exoplayer2.metadata.MetadataRenderer;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
...@@ -47,8 +50,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelector; ...@@ -47,8 +50,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
...@@ -59,7 +62,7 @@ import java.util.List; ...@@ -59,7 +62,7 @@ import java.util.List;
/** /**
* An extensible media player that plays {@link MediaSource}s. Instances can be obtained from {@link * An extensible media player that plays {@link MediaSource}s. Instances can be obtained from {@link
* SimpleExoPlayer.Builder}. * Builder}.
* *
* <h2>Player components</h2> * <h2>Player components</h2>
* *
...@@ -73,10 +76,10 @@ import java.util.List; ...@@ -73,10 +76,10 @@ import java.util.List;
* <li><b>{@link MediaSource MediaSources}</b> that define the media to be played, load the media, * <li><b>{@link MediaSource MediaSources}</b> that define the media to be played, load the media,
* and from which the loaded media can be read. MediaSources are created from {@link MediaItem * and from which the loaded media can be read. MediaSources are created from {@link MediaItem
* MediaItems} by the {@link MediaSourceFactory} injected into the player {@link * MediaItems} by the {@link MediaSourceFactory} injected into the player {@link
* SimpleExoPlayer.Builder#setMediaSourceFactory Builder}, or can be added directly by methods * Builder#setMediaSourceFactory Builder}, or can be added directly by methods like {@link
* like {@link #setMediaSource(MediaSource)}. The library provides a {@link * #setMediaSource(MediaSource)}. The library provides a {@link DefaultMediaSourceFactory} for
* DefaultMediaSourceFactory} for progressive media files, DASH, SmoothStreaming and HLS, * progressive media files, DASH, SmoothStreaming and HLS, which also includes functionality
* which also includes functionality for side-loading subtitle files and clipping media. * for side-loading subtitle files and clipping media.
* <li><b>{@link Renderer}</b>s that render individual components of the media. The library * <li><b>{@link Renderer}</b>s that render individual components of the media. The library
* provides default implementations for common media types ({@link MediaCodecVideoRenderer}, * provides default implementations for common media types ({@link MediaCodecVideoRenderer},
* {@link MediaCodecAudioRenderer}, {@link TextRenderer} and {@link MetadataRenderer}). A * {@link MediaCodecAudioRenderer}, {@link TextRenderer} and {@link MetadataRenderer}). A
...@@ -506,12 +509,6 @@ public interface ExoPlayer extends Player { ...@@ -506,12 +509,6 @@ public interface ExoPlayer extends Player {
} }
/** /**
* The default timeout for calls to {@link #release} and {@link #setForegroundMode}, in
* milliseconds.
*/
long DEFAULT_RELEASE_TIMEOUT_MS = 500;
/**
* A listener for audio offload events. * A listener for audio offload events.
* *
* <p>This class is experimental, and might be renamed, moved or removed in a future release. * <p>This class is experimental, and might be renamed, moved or removed in a future release.
...@@ -519,7 +516,7 @@ public interface ExoPlayer extends Player { ...@@ -519,7 +516,7 @@ public interface ExoPlayer extends Player {
interface AudioOffloadListener { interface AudioOffloadListener {
/** /**
* Called when the player has started or stopped offload scheduling using {@link * Called when the player has started or stopped offload scheduling using {@link
* ExoPlayer#experimentalSetOffloadSchedulingEnabled(boolean)}. * #experimentalSetOffloadSchedulingEnabled(boolean)}.
* *
* <p>This method is experimental, and will be renamed or removed in a future release. * <p>This method is experimental, and will be renamed or removed in a future release.
*/ */
...@@ -534,39 +531,28 @@ public interface ExoPlayer extends Player { ...@@ -534,39 +531,28 @@ public interface ExoPlayer extends Player {
} }
/** /**
* A builder for {@link ExoPlayer} instances. * A builder for {@link SimpleExoPlayer} instances.
*
* <p>See {@link #Builder(Context, Renderer...)} for the list of default values.
* *
* @deprecated Use {@link SimpleExoPlayer.Builder} instead. * <p>See {@link #Builder(Context)} for the list of default values.
*/ */
@Deprecated @SuppressWarnings("deprecation")
final class Builder { final class Builder {
private final Renderer[] renderers; private final SimpleExoPlayer.Builder wrappedBuilder;
private Clock clock;
private TrackSelector trackSelector;
private MediaSourceFactory mediaSourceFactory;
private LoadControl loadControl;
private BandwidthMeter bandwidthMeter;
private Looper looper;
@Nullable private AnalyticsCollector analyticsCollector;
private boolean useLazyPreparation;
private SeekParameters seekParameters;
private boolean pauseAtEndOfMediaItems;
private long releaseTimeoutMs;
private LivePlaybackSpeedControl livePlaybackSpeedControl;
private boolean buildCalled;
private long setForegroundModeTimeoutMs;
/** /**
* Creates a builder with a list of {@link Renderer Renderers}. * Creates a builder.
*
* <p>Use {@link #Builder(Context, RenderersFactory)}, {@link #Builder(Context,
* RenderersFactory)} or {@link #Builder(Context, RenderersFactory, ExtractorsFactory)} instead,
* if you intend to provide a custom {@link RenderersFactory} or a custom {@link
* ExtractorsFactory}. This is to ensure that ProGuard or R8 can remove ExoPlayer's {@link
* DefaultRenderersFactory} and {@link DefaultExtractorsFactory} from the APK.
* *
* <p>The builder uses the following default values: * <p>The builder uses the following default values:
* *
* <ul> * <ul>
* <li>{@link RenderersFactory}: {@link DefaultRenderersFactory}
* <li>{@link TrackSelector}: {@link DefaultTrackSelector} * <li>{@link TrackSelector}: {@link DefaultTrackSelector}
* <li>{@link MediaSourceFactory}: {@link DefaultMediaSourceFactory} * <li>{@link MediaSourceFactory}: {@link DefaultMediaSourceFactory}
* <li>{@link LoadControl}: {@link DefaultLoadControl} * <li>{@link LoadControl}: {@link DefaultLoadControl}
...@@ -576,23 +562,70 @@ public interface ExoPlayer extends Player { ...@@ -576,23 +562,70 @@ public interface ExoPlayer extends Player {
* Looper} of the application's main thread if the current thread doesn't have a {@link * Looper} of the application's main thread if the current thread doesn't have a {@link
* Looper} * Looper}
* <li>{@link AnalyticsCollector}: {@link AnalyticsCollector} with {@link Clock#DEFAULT} * <li>{@link AnalyticsCollector}: {@link AnalyticsCollector} with {@link Clock#DEFAULT}
* <li>{@link PriorityTaskManager}: {@code null} (not used)
* <li>{@link AudioAttributes}: {@link AudioAttributes#DEFAULT}, not handling audio focus
* <li>{@link C.WakeMode}: {@link C#WAKE_MODE_NONE}
* <li>{@code handleAudioBecomingNoisy}: {@code false}
* <li>{@code skipSilenceEnabled}: {@code false}
* <li>{@link C.VideoScalingMode}: {@link C#VIDEO_SCALING_MODE_DEFAULT}
* <li>{@link C.VideoChangeFrameRateStrategy}: {@link
* C#VIDEO_CHANGE_FRAME_RATE_STRATEGY_ONLY_IF_SEAMLESS}
* <li>{@code useLazyPreparation}: {@code true} * <li>{@code useLazyPreparation}: {@code true}
* <li>{@link SeekParameters}: {@link SeekParameters#DEFAULT} * <li>{@link SeekParameters}: {@link SeekParameters#DEFAULT}
* <li>{@code releaseTimeoutMs}: {@link ExoPlayer#DEFAULT_RELEASE_TIMEOUT_MS} * <li>{@code seekBackIncrementMs}: {@link C#DEFAULT_SEEK_BACK_INCREMENT_MS}
* <li>{@code seekForwardIncrementMs}: {@link C#DEFAULT_SEEK_FORWARD_INCREMENT_MS}
* <li>{@code releaseTimeoutMs}: {@link #DEFAULT_RELEASE_TIMEOUT_MS}
* <li>{@code detachSurfaceTimeoutMs}: {@link #DEFAULT_DETACH_SURFACE_TIMEOUT_MS}
* <li>{@code pauseAtEndOfMediaItems}: {@code false} * <li>{@code pauseAtEndOfMediaItems}: {@code false}
* <li>{@link Clock}: {@link Clock#DEFAULT} * <li>{@link Clock}: {@link Clock#DEFAULT}
* </ul> * </ul>
* *
* @param context A {@link Context}. * @param context A {@link Context}.
* @param renderers The {@link Renderer Renderers} to be used by the player. */
*/ public Builder(Context context) {
public Builder(Context context, Renderer... renderers) { wrappedBuilder = new SimpleExoPlayer.Builder(context);
this( }
renderers,
new DefaultTrackSelector(context), /**
new DefaultMediaSourceFactory(context), * Creates a builder with a custom {@link RenderersFactory}.
new DefaultLoadControl(), *
DefaultBandwidthMeter.getSingletonInstance(context)); * <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
*/
public Builder(Context context, RenderersFactory renderersFactory) {
wrappedBuilder = new SimpleExoPlayer.Builder(context, renderersFactory);
}
/**
* Creates a builder with a custom {@link ExtractorsFactory}.
*
* <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param extractorsFactory An {@link ExtractorsFactory} used to extract progressive media from
* its container.
*/
public Builder(Context context, ExtractorsFactory extractorsFactory) {
wrappedBuilder = new SimpleExoPlayer.Builder(context, extractorsFactory);
}
/**
* Creates a builder with a custom {@link RenderersFactory} and {@link ExtractorsFactory}.
*
* <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
* @param extractorsFactory An {@link ExtractorsFactory} used to extract progressive media from
* its container.
*/
public Builder(
Context context, RenderersFactory renderersFactory, ExtractorsFactory extractorsFactory) {
wrappedBuilder = new SimpleExoPlayer.Builder(context, renderersFactory, extractorsFactory);
} }
/** /**
...@@ -601,44 +634,45 @@ public interface ExoPlayer extends Player { ...@@ -601,44 +634,45 @@ public interface ExoPlayer extends Player {
* <p>Note that this constructor is only useful to try and ensure that ExoPlayer's default * <p>Note that this constructor is only useful to try and ensure that ExoPlayer's default
* components can be removed by ProGuard or R8. * components can be removed by ProGuard or R8.
* *
* @param renderers The {@link Renderer Renderers} to be used by the player. * @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
* @param trackSelector A {@link TrackSelector}. * @param trackSelector A {@link TrackSelector}.
* @param mediaSourceFactory A {@link MediaSourceFactory}. * @param mediaSourceFactory A {@link MediaSourceFactory}.
* @param loadControl A {@link LoadControl}. * @param loadControl A {@link LoadControl}.
* @param bandwidthMeter A {@link BandwidthMeter}. * @param bandwidthMeter A {@link BandwidthMeter}.
* @param analyticsCollector An {@link AnalyticsCollector}.
*/ */
public Builder( public Builder(
Renderer[] renderers, Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector, TrackSelector trackSelector,
MediaSourceFactory mediaSourceFactory, MediaSourceFactory mediaSourceFactory,
LoadControl loadControl, LoadControl loadControl,
BandwidthMeter bandwidthMeter) { BandwidthMeter bandwidthMeter,
Assertions.checkArgument(renderers.length > 0); AnalyticsCollector analyticsCollector) {
this.renderers = renderers; wrappedBuilder =
this.trackSelector = trackSelector; new SimpleExoPlayer.Builder(
this.mediaSourceFactory = mediaSourceFactory; context,
this.loadControl = loadControl; renderersFactory,
this.bandwidthMeter = bandwidthMeter; trackSelector,
looper = Util.getCurrentOrMainLooper(); mediaSourceFactory,
useLazyPreparation = true; loadControl,
seekParameters = SeekParameters.DEFAULT; bandwidthMeter,
livePlaybackSpeedControl = new DefaultLivePlaybackSpeedControl.Builder().build(); analyticsCollector);
clock = Clock.DEFAULT;
releaseTimeoutMs = DEFAULT_RELEASE_TIMEOUT_MS;
} }
/** /**
* Set a limit on the time a call to {@link ExoPlayer#setForegroundMode} can spend. If a call to * Set a limit on the time a call to {@link #setForegroundMode} can spend. If a call to {@link
* {@link ExoPlayer#setForegroundMode} takes more than {@code timeoutMs} milliseconds to * #setForegroundMode} takes more than {@code timeoutMs} milliseconds to complete, the player
* complete, the player will raise an error via {@link Player.Listener#onPlayerError}. * will raise an error via {@link Player.Listener#onPlayerError}.
* *
* <p>This method is experimental, and will be renamed or removed in a future release. * <p>This method is experimental, and will be renamed or removed in a future release.
* *
* @param timeoutMs The time limit in milliseconds. * @param timeoutMs The time limit in milliseconds.
*/ */
public Builder experimentalSetForegroundModeTimeoutMs(long timeoutMs) { public Builder experimentalSetForegroundModeTimeoutMs(long timeoutMs) {
Assertions.checkState(!buildCalled); wrappedBuilder.experimentalSetForegroundModeTimeoutMs(timeoutMs);
setForegroundModeTimeoutMs = timeoutMs;
return this; return this;
} }
...@@ -650,8 +684,7 @@ public interface ExoPlayer extends Player { ...@@ -650,8 +684,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setTrackSelector(TrackSelector trackSelector) { public Builder setTrackSelector(TrackSelector trackSelector) {
Assertions.checkState(!buildCalled); wrappedBuilder.setTrackSelector(trackSelector);
this.trackSelector = trackSelector;
return this; return this;
} }
...@@ -663,8 +696,7 @@ public interface ExoPlayer extends Player { ...@@ -663,8 +696,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) { public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) {
Assertions.checkState(!buildCalled); wrappedBuilder.setMediaSourceFactory(mediaSourceFactory);
this.mediaSourceFactory = mediaSourceFactory;
return this; return this;
} }
...@@ -676,8 +708,7 @@ public interface ExoPlayer extends Player { ...@@ -676,8 +708,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setLoadControl(LoadControl loadControl) { public Builder setLoadControl(LoadControl loadControl) {
Assertions.checkState(!buildCalled); wrappedBuilder.setLoadControl(loadControl);
this.loadControl = loadControl;
return this; return this;
} }
...@@ -689,8 +720,7 @@ public interface ExoPlayer extends Player { ...@@ -689,8 +720,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) { public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) {
Assertions.checkState(!buildCalled); wrappedBuilder.setBandwidthMeter(bandwidthMeter);
this.bandwidthMeter = bandwidthMeter;
return this; return this;
} }
...@@ -703,8 +733,7 @@ public interface ExoPlayer extends Player { ...@@ -703,8 +733,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setLooper(Looper looper) { public Builder setLooper(Looper looper) {
Assertions.checkState(!buildCalled); wrappedBuilder.setLooper(looper);
this.looper = looper;
return this; return this;
} }
...@@ -716,8 +745,124 @@ public interface ExoPlayer extends Player { ...@@ -716,8 +745,124 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) { public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) {
Assertions.checkState(!buildCalled); wrappedBuilder.setAnalyticsCollector(analyticsCollector);
this.analyticsCollector = analyticsCollector; return this;
}
/**
* Sets an {@link PriorityTaskManager} that will be used by the player.
*
* <p>The priority {@link C#PRIORITY_PLAYBACK} will be set while the player is loading.
*
* @param priorityTaskManager A {@link PriorityTaskManager}, or null to not use one.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setPriorityTaskManager(@Nullable PriorityTaskManager priorityTaskManager) {
wrappedBuilder.setPriorityTaskManager(priorityTaskManager);
return this;
}
/**
* Sets {@link AudioAttributes} that will be used by the player and whether to handle audio
* focus.
*
* <p>If audio focus should be handled, the {@link AudioAttributes#usage} must be {@link
* C#USAGE_MEDIA} or {@link C#USAGE_GAME}. Other usages will throw an {@link
* IllegalArgumentException}.
*
* @param audioAttributes {@link AudioAttributes}.
* @param handleAudioFocus Whether the player should handle audio focus.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) {
wrappedBuilder.setAudioAttributes(audioAttributes, handleAudioFocus);
return this;
}
/**
* Sets the {@link C.WakeMode} that will be used by the player.
*
* <p>Enabling this feature requires the {@link android.Manifest.permission#WAKE_LOCK}
* permission. It should be used together with a foreground {@link android.app.Service} for use
* cases where playback occurs and the screen is off (e.g. background audio playback). It is not
* useful when the screen will be kept on during playback (e.g. foreground video playback).
*
* <p>When enabled, the locks ({@link android.os.PowerManager.WakeLock} / {@link
* android.net.wifi.WifiManager.WifiLock}) will be held whenever the player is in the {@link
* #STATE_READY} or {@link #STATE_BUFFERING} states with {@code playWhenReady = true}. The locks
* held depend on the specified {@link C.WakeMode}.
*
* @param wakeMode A {@link C.WakeMode}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setWakeMode(@C.WakeMode int wakeMode) {
wrappedBuilder.setWakeMode(wakeMode);
return this;
}
/**
* Sets whether the player should pause automatically when audio is rerouted from a headset to
* device speakers. See the <a
* href="https://developer.android.com/guide/topics/media-apps/volume-and-earphones#becoming-noisy">
* audio becoming noisy</a> documentation for more information.
*
* @param handleAudioBecomingNoisy Whether the player should pause automatically when audio is
* rerouted from a headset to device speakers.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setHandleAudioBecomingNoisy(boolean handleAudioBecomingNoisy) {
wrappedBuilder.setHandleAudioBecomingNoisy(handleAudioBecomingNoisy);
return this;
}
/**
* Sets whether silences silences in the audio stream is enabled.
*
* @param skipSilenceEnabled Whether skipping silences is enabled.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSkipSilenceEnabled(boolean skipSilenceEnabled) {
wrappedBuilder.setSkipSilenceEnabled(skipSilenceEnabled);
return this;
}
/**
* Sets the {@link C.VideoScalingMode} that will be used by the player.
*
* <p>The scaling mode only applies if a {@link MediaCodec}-based video {@link Renderer} is
* enabled and if the output surface is owned by a {@link SurfaceView}.
*
* @param videoScalingMode A {@link C.VideoScalingMode}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) {
wrappedBuilder.setVideoScalingMode(videoScalingMode);
return this;
}
/**
* Sets a {@link C.VideoChangeFrameRateStrategy} that will be used by the player when provided
* with a video output {@link Surface}.
*
* <p>The strategy only applies if a {@link MediaCodec}-based video {@link Renderer} is enabled.
* Applications wishing to use {@link Surface#CHANGE_FRAME_RATE_ALWAYS} should set the mode to
* {@link C#VIDEO_CHANGE_FRAME_RATE_STRATEGY_OFF} to disable calls to {@link
* Surface#setFrameRate} from ExoPlayer, and should then call {@link Surface#setFrameRate}
* directly from application code.
*
* @param videoChangeFrameRateStrategy A {@link C.VideoChangeFrameRateStrategy}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setVideoChangeFrameRateStrategy(
@C.VideoChangeFrameRateStrategy int videoChangeFrameRateStrategy) {
wrappedBuilder.setVideoChangeFrameRateStrategy(videoChangeFrameRateStrategy);
return this; return this;
} }
...@@ -733,8 +878,7 @@ public interface ExoPlayer extends Player { ...@@ -733,8 +878,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setUseLazyPreparation(boolean useLazyPreparation) { public Builder setUseLazyPreparation(boolean useLazyPreparation) {
Assertions.checkState(!buildCalled); wrappedBuilder.setUseLazyPreparation(useLazyPreparation);
this.useLazyPreparation = useLazyPreparation;
return this; return this;
} }
...@@ -746,8 +890,33 @@ public interface ExoPlayer extends Player { ...@@ -746,8 +890,33 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setSeekParameters(SeekParameters seekParameters) { public Builder setSeekParameters(SeekParameters seekParameters) {
Assertions.checkState(!buildCalled); wrappedBuilder.setSeekParameters(seekParameters);
this.seekParameters = seekParameters; return this;
}
/**
* Sets the {@link #seekBack()} increment.
*
* @param seekBackIncrementMs The seek back increment, in milliseconds.
* @return This builder.
* @throws IllegalArgumentException If {@code seekBackIncrementMs} is non-positive.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSeekBackIncrementMs(@IntRange(from = 1) long seekBackIncrementMs) {
wrappedBuilder.setSeekBackIncrementMs(seekBackIncrementMs);
return this;
}
/**
* Sets the {@link #seekForward()} increment.
*
* @param seekForwardIncrementMs The seek forward increment, in milliseconds.
* @return This builder.
* @throws IllegalArgumentException If {@code seekForwardIncrementMs} is non-positive.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSeekForwardIncrementMs(@IntRange(from = 1) long seekForwardIncrementMs) {
wrappedBuilder.setSeekForwardIncrementMs(seekForwardIncrementMs);
return this; return this;
} }
...@@ -763,8 +932,23 @@ public interface ExoPlayer extends Player { ...@@ -763,8 +932,23 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setReleaseTimeoutMs(long releaseTimeoutMs) { public Builder setReleaseTimeoutMs(long releaseTimeoutMs) {
Assertions.checkState(!buildCalled); wrappedBuilder.setReleaseTimeoutMs(releaseTimeoutMs);
this.releaseTimeoutMs = releaseTimeoutMs; return this;
}
/**
* Sets a timeout for detaching a surface from the player.
*
* <p>If detaching a surface or replacing a surface takes more than {@code
* detachSurfaceTimeoutMs} to complete, the player will report an error via {@link
* Player.Listener#onPlayerError}.
*
* @param detachSurfaceTimeoutMs The timeout for detaching a surface, in milliseconds.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setDetachSurfaceTimeoutMs(long detachSurfaceTimeoutMs) {
wrappedBuilder.setDetachSurfaceTimeoutMs(detachSurfaceTimeoutMs);
return this; return this;
} }
...@@ -781,8 +965,7 @@ public interface ExoPlayer extends Player { ...@@ -781,8 +965,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) { public Builder setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) {
Assertions.checkState(!buildCalled); wrappedBuilder.setPauseAtEndOfMediaItems(pauseAtEndOfMediaItems);
this.pauseAtEndOfMediaItems = pauseAtEndOfMediaItems;
return this; return this;
} }
...@@ -795,8 +978,7 @@ public interface ExoPlayer extends Player { ...@@ -795,8 +978,7 @@ public interface ExoPlayer extends Player {
* @throws IllegalStateException If {@link #build()} has already been called. * @throws IllegalStateException If {@link #build()} has already been called.
*/ */
public Builder setLivePlaybackSpeedControl(LivePlaybackSpeedControl livePlaybackSpeedControl) { public Builder setLivePlaybackSpeedControl(LivePlaybackSpeedControl livePlaybackSpeedControl) {
Assertions.checkState(!buildCalled); wrappedBuilder.setLivePlaybackSpeedControl(livePlaybackSpeedControl);
this.livePlaybackSpeedControl = livePlaybackSpeedControl;
return this; return this;
} }
...@@ -810,47 +992,30 @@ public interface ExoPlayer extends Player { ...@@ -810,47 +992,30 @@ public interface ExoPlayer extends Player {
*/ */
@VisibleForTesting @VisibleForTesting
public Builder setClock(Clock clock) { public Builder setClock(Clock clock) {
Assertions.checkState(!buildCalled); wrappedBuilder.setClock(clock);
this.clock = clock;
return this; return this;
} }
/** /**
* Builds an {@link ExoPlayer} instance. * Builds a {@link SimpleExoPlayer} instance.
* *
* @throws IllegalStateException If {@code build} has already been called. * @throws IllegalStateException If this method has already been called.
*/ */
public ExoPlayer build() { public SimpleExoPlayer build() {
Assertions.checkState(!buildCalled); return wrappedBuilder.build();
buildCalled = true;
ExoPlayerImpl player =
new ExoPlayerImpl(
renderers,
trackSelector,
mediaSourceFactory,
loadControl,
bandwidthMeter,
analyticsCollector,
useLazyPreparation,
seekParameters,
C.DEFAULT_SEEK_BACK_INCREMENT_MS,
C.DEFAULT_SEEK_FORWARD_INCREMENT_MS,
livePlaybackSpeedControl,
releaseTimeoutMs,
pauseAtEndOfMediaItems,
clock,
looper,
/* wrappingPlayer= */ null,
/* additionalPermanentAvailableCommands= */ Commands.EMPTY);
if (setForegroundModeTimeoutMs > 0) {
player.experimentalSetForegroundModeTimeoutMs(setForegroundModeTimeoutMs);
}
return player;
} }
} }
/** /**
* The default timeout for calls to {@link #release} and {@link #setForegroundMode}, in
* milliseconds.
*/
long DEFAULT_RELEASE_TIMEOUT_MS = 500;
/** The default timeout for detaching a surface from the player, in milliseconds. */
long DEFAULT_DETACH_SURFACE_TIMEOUT_MS = 2_000;
/**
* Equivalent to {@link Player#getPlayerError()}, except the exception is guaranteed to be an * Equivalent to {@link Player#getPlayerError()}, except the exception is guaranteed to be an
* {@link ExoPlaybackException}. * {@link ExoPlaybackException}.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -35,7 +35,6 @@ import android.graphics.Rect; ...@@ -35,7 +35,6 @@ import android.graphics.Rect;
import android.graphics.SurfaceTexture; 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.MediaFormat; import android.media.MediaFormat;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
...@@ -91,7 +90,7 @@ import java.util.concurrent.TimeoutException; ...@@ -91,7 +90,7 @@ import java.util.concurrent.TimeoutException;
/** /**
* An {@link ExoPlayer} implementation that uses default {@link Renderer} components. Instances can * An {@link ExoPlayer} implementation that uses default {@link Renderer} components. Instances can
* be obtained from {@link SimpleExoPlayer.Builder}. * be obtained from {@link ExoPlayer.Builder}.
*/ */
public class SimpleExoPlayer extends BasePlayer public class SimpleExoPlayer extends BasePlayer
implements ExoPlayer, implements ExoPlayer,
...@@ -101,14 +100,9 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -101,14 +100,9 @@ public class SimpleExoPlayer extends BasePlayer
ExoPlayer.MetadataComponent, ExoPlayer.MetadataComponent,
ExoPlayer.DeviceComponent { ExoPlayer.DeviceComponent {
/** The default timeout for detaching a surface from the player, in milliseconds. */ /** @deprecated Use {@link ExoPlayer.Builder} instead. */
public static final long DEFAULT_DETACH_SURFACE_TIMEOUT_MS = 2_000; @Deprecated
@SuppressWarnings("deprecation")
/**
* A builder for {@link SimpleExoPlayer} instances.
*
* <p>See {@link #Builder(Context)} for the list of default values.
*/
public static final class Builder { public static final class Builder {
private final Context context; private final Context context;
...@@ -140,89 +134,29 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -140,89 +134,29 @@ public class SimpleExoPlayer extends BasePlayer
private boolean pauseAtEndOfMediaItems; private boolean pauseAtEndOfMediaItems;
private boolean buildCalled; private boolean buildCalled;
/** /** @deprecated Use {@link ExoPlayer.Builder#Builder(Context)} instead. */
* Creates a builder. @Deprecated
*
* <p>Use {@link #Builder(Context, RenderersFactory)}, {@link #Builder(Context,
* RenderersFactory)} or {@link #Builder(Context, RenderersFactory, ExtractorsFactory)} instead,
* if you intend to provide a custom {@link RenderersFactory} or a custom {@link
* ExtractorsFactory}. This is to ensure that ProGuard or R8 can remove ExoPlayer's {@link
* DefaultRenderersFactory} and {@link DefaultExtractorsFactory} from the APK.
*
* <p>The builder uses the following default values:
*
* <ul>
* <li>{@link RenderersFactory}: {@link DefaultRenderersFactory}
* <li>{@link TrackSelector}: {@link DefaultTrackSelector}
* <li>{@link MediaSourceFactory}: {@link DefaultMediaSourceFactory}
* <li>{@link LoadControl}: {@link DefaultLoadControl}
* <li>{@link BandwidthMeter}: {@link DefaultBandwidthMeter#getSingletonInstance(Context)}
* <li>{@link LivePlaybackSpeedControl}: {@link DefaultLivePlaybackSpeedControl}
* <li>{@link Looper}: The {@link Looper} associated with the current thread, or the {@link
* Looper} of the application's main thread if the current thread doesn't have a {@link
* Looper}
* <li>{@link AnalyticsCollector}: {@link AnalyticsCollector} with {@link Clock#DEFAULT}
* <li>{@link PriorityTaskManager}: {@code null} (not used)
* <li>{@link AudioAttributes}: {@link AudioAttributes#DEFAULT}, not handling audio focus
* <li>{@link C.WakeMode}: {@link C#WAKE_MODE_NONE}
* <li>{@code handleAudioBecomingNoisy}: {@code false}
* <li>{@code skipSilenceEnabled}: {@code false}
* <li>{@link C.VideoScalingMode}: {@link C#VIDEO_SCALING_MODE_DEFAULT}
* <li>{@link C.VideoChangeFrameRateStrategy}: {@link
* C#VIDEO_CHANGE_FRAME_RATE_STRATEGY_ONLY_IF_SEAMLESS}
* <li>{@code useLazyPreparation}: {@code true}
* <li>{@link SeekParameters}: {@link SeekParameters#DEFAULT}
* <li>{@code seekBackIncrementMs}: {@link C#DEFAULT_SEEK_BACK_INCREMENT_MS}
* <li>{@code seekForwardIncrementMs}: {@link C#DEFAULT_SEEK_FORWARD_INCREMENT_MS}
* <li>{@code releaseTimeoutMs}: {@link ExoPlayer#DEFAULT_RELEASE_TIMEOUT_MS}
* <li>{@code detachSurfaceTimeoutMs}: {@link #DEFAULT_DETACH_SURFACE_TIMEOUT_MS}
* <li>{@code pauseAtEndOfMediaItems}: {@code false}
* <li>{@link Clock}: {@link Clock#DEFAULT}
* </ul>
*
* @param context A {@link Context}.
*/
public Builder(Context context) { public Builder(Context context) {
this(context, new DefaultRenderersFactory(context), new DefaultExtractorsFactory()); this(context, new DefaultRenderersFactory(context), new DefaultExtractorsFactory());
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#Builder(Context, RenderersFactory)} instead. */
* Creates a builder with a custom {@link RenderersFactory}. @Deprecated
*
* <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
*/
public Builder(Context context, RenderersFactory renderersFactory) { public Builder(Context context, RenderersFactory renderersFactory) {
this(context, renderersFactory, new DefaultExtractorsFactory()); this(context, renderersFactory, new DefaultExtractorsFactory());
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#Builder(Context, ExtractorsFactory)} instead. */
* Creates a builder with a custom {@link ExtractorsFactory}. @Deprecated
*
* <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param extractorsFactory An {@link ExtractorsFactory} used to extract progressive media from
* its container.
*/
public Builder(Context context, ExtractorsFactory extractorsFactory) { public Builder(Context context, ExtractorsFactory extractorsFactory) {
this(context, new DefaultRenderersFactory(context), extractorsFactory); this(context, new DefaultRenderersFactory(context), extractorsFactory);
} }
/** /**
* Creates a builder with a custom {@link RenderersFactory} and {@link ExtractorsFactory}. * @deprecated Use {@link ExoPlayer.Builder#Builder(Context, RenderersFactory,
* * ExtractorsFactory)} instead.
* <p>See {@link #Builder(Context)} for a list of default values.
*
* @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
* @param extractorsFactory An {@link ExtractorsFactory} used to extract progressive media from
* its container.
*/ */
@Deprecated
public Builder( public Builder(
Context context, RenderersFactory renderersFactory, ExtractorsFactory extractorsFactory) { Context context, RenderersFactory renderersFactory, ExtractorsFactory extractorsFactory) {
this( this(
...@@ -236,20 +170,10 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -236,20 +170,10 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Creates a builder with the specified custom components. * @deprecated Use {@link ExoPlayer.Builder#Builder(Context, RenderersFactory, TrackSelector,
* * MediaSourceFactory, LoadControl, BandwidthMeter, AnalyticsCollector)} instead.
* <p>Note that this constructor is only useful to try and ensure that ExoPlayer's default
* components can be removed by ProGuard or R8.
*
* @param context A {@link Context}.
* @param renderersFactory A factory for creating {@link Renderer Renderers} to be used by the
* player.
* @param trackSelector A {@link TrackSelector}.
* @param mediaSourceFactory A {@link MediaSourceFactory}.
* @param loadControl A {@link LoadControl}.
* @param bandwidthMeter A {@link BandwidthMeter}.
* @param analyticsCollector An {@link AnalyticsCollector}.
*/ */
@Deprecated
public Builder( public Builder(
Context context, Context context,
RenderersFactory renderersFactory, RenderersFactory renderersFactory,
...@@ -276,32 +200,23 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -276,32 +200,23 @@ public class SimpleExoPlayer extends BasePlayer
seekForwardIncrementMs = C.DEFAULT_SEEK_FORWARD_INCREMENT_MS; seekForwardIncrementMs = C.DEFAULT_SEEK_FORWARD_INCREMENT_MS;
livePlaybackSpeedControl = new DefaultLivePlaybackSpeedControl.Builder().build(); livePlaybackSpeedControl = new DefaultLivePlaybackSpeedControl.Builder().build();
clock = Clock.DEFAULT; clock = Clock.DEFAULT;
releaseTimeoutMs = ExoPlayer.DEFAULT_RELEASE_TIMEOUT_MS; releaseTimeoutMs = DEFAULT_RELEASE_TIMEOUT_MS;
detachSurfaceTimeoutMs = DEFAULT_DETACH_SURFACE_TIMEOUT_MS; detachSurfaceTimeoutMs = DEFAULT_DETACH_SURFACE_TIMEOUT_MS;
} }
/** /**
* Set a limit on the time a call to {@link #setForegroundMode} can spend. If a call to {@link * @deprecated Use {@link ExoPlayer.Builder#experimentalSetForegroundModeTimeoutMs(long)}
* #setForegroundMode} takes more than {@code timeoutMs} milliseconds to complete, the player * instead.
* will raise an error via {@link Player.Listener#onPlayerError}.
*
* <p>This method is experimental, and will be renamed or removed in a future release.
*
* @param timeoutMs The time limit in milliseconds.
*/ */
@Deprecated
public Builder experimentalSetForegroundModeTimeoutMs(long timeoutMs) { public Builder experimentalSetForegroundModeTimeoutMs(long timeoutMs) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
foregroundModeTimeoutMs = timeoutMs; foregroundModeTimeoutMs = timeoutMs;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setTrackSelector(TrackSelector)} instead. */
* Sets the {@link TrackSelector} that will be used by the player. @Deprecated
*
* @param trackSelector A {@link TrackSelector}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setTrackSelector(TrackSelector trackSelector) { public Builder setTrackSelector(TrackSelector trackSelector) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.trackSelector = trackSelector; this.trackSelector = trackSelector;
...@@ -309,52 +224,33 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -309,52 +224,33 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Sets the {@link MediaSourceFactory} that will be used by the player. * @deprecated Use {@link ExoPlayer.Builder#setMediaSourceFactory(MediaSourceFactory)} instead.
*
* @param mediaSourceFactory A {@link MediaSourceFactory}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/ */
@Deprecated
public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) { public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.mediaSourceFactory = mediaSourceFactory; this.mediaSourceFactory = mediaSourceFactory;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setLoadControl(LoadControl)} instead. */
* Sets the {@link LoadControl} that will be used by the player. @Deprecated
*
* @param loadControl A {@link LoadControl}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setLoadControl(LoadControl loadControl) { public Builder setLoadControl(LoadControl loadControl) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.loadControl = loadControl; this.loadControl = loadControl;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setBandwidthMeter(BandwidthMeter)} instead. */
* Sets the {@link BandwidthMeter} that will be used by the player. @Deprecated
*
* @param bandwidthMeter A {@link BandwidthMeter}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) { public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.bandwidthMeter = bandwidthMeter; this.bandwidthMeter = bandwidthMeter;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setLooper(Looper)} instead. */
* Sets the {@link Looper} that must be used for all calls to the player and that is used to @Deprecated
* call listeners on.
*
* @param looper A {@link Looper}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setLooper(Looper looper) { public Builder setLooper(Looper looper) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.looper = looper; this.looper = looper;
...@@ -362,12 +258,9 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -362,12 +258,9 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Sets the {@link AnalyticsCollector} that will collect and forward all player events. * @deprecated Use {@link ExoPlayer.Builder#setAnalyticsCollector(AnalyticsCollector)} instead.
*
* @param analyticsCollector An {@link AnalyticsCollector}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/ */
@Deprecated
public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) { public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.analyticsCollector = analyticsCollector; this.analyticsCollector = analyticsCollector;
...@@ -375,14 +268,10 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -375,14 +268,10 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Sets an {@link PriorityTaskManager} that will be used by the player. * @deprecated Use {@link ExoPlayer.Builder#setPriorityTaskManager(PriorityTaskManager)}
* * instead.
* <p>The priority {@link C#PRIORITY_PLAYBACK} will be set while the player is loading.
*
* @param priorityTaskManager A {@link PriorityTaskManager}, or null to not use one.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/ */
@Deprecated
public Builder setPriorityTaskManager(@Nullable PriorityTaskManager priorityTaskManager) { public Builder setPriorityTaskManager(@Nullable PriorityTaskManager priorityTaskManager) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.priorityTaskManager = priorityTaskManager; this.priorityTaskManager = priorityTaskManager;
...@@ -390,18 +279,10 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -390,18 +279,10 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Sets {@link AudioAttributes} that will be used by the player and whether to handle audio * @deprecated Use {@link ExoPlayer.Builder#setAudioAttributes(AudioAttributes, boolean)}
* focus. * instead.
*
* <p>If audio focus should be handled, the {@link AudioAttributes#usage} must be {@link
* C#USAGE_MEDIA} or {@link C#USAGE_GAME}. Other usages will throw an {@link
* IllegalArgumentException}.
*
* @param audioAttributes {@link AudioAttributes}.
* @param handleAudioFocus Whether the player should handle audio focus.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/ */
@Deprecated
public Builder setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) { public Builder setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.audioAttributes = audioAttributes; this.audioAttributes = audioAttributes;
...@@ -409,89 +290,40 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -409,89 +290,40 @@ public class SimpleExoPlayer extends BasePlayer
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setWakeMode(int)} instead. */
* Sets the {@link C.WakeMode} that will be used by the player. @Deprecated
*
* <p>Enabling this feature requires the {@link android.Manifest.permission#WAKE_LOCK}
* permission. It should be used together with a foreground {@link android.app.Service} for use
* cases where playback occurs and the screen is off (e.g. background audio playback). It is not
* useful when the screen will be kept on during playback (e.g. foreground video playback).
*
* <p>When enabled, the locks ({@link android.os.PowerManager.WakeLock} / {@link
* android.net.wifi.WifiManager.WifiLock}) will be held whenever the player is in the {@link
* #STATE_READY} or {@link #STATE_BUFFERING} states with {@code playWhenReady = true}. The locks
* held depend on the specified {@link C.WakeMode}.
*
* @param wakeMode A {@link C.WakeMode}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setWakeMode(@C.WakeMode int wakeMode) { public Builder setWakeMode(@C.WakeMode int wakeMode) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.wakeMode = wakeMode; this.wakeMode = wakeMode;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setHandleAudioBecomingNoisy(boolean)} instead. */
* Sets whether the player should pause automatically when audio is rerouted from a headset to @Deprecated
* device speakers. See the <a
* href="https://developer.android.com/guide/topics/media-apps/volume-and-earphones#becoming-noisy">audio
* becoming noisy</a> documentation for more information.
*
* @param handleAudioBecomingNoisy Whether the player should pause automatically when audio is
* rerouted from a headset to device speakers.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setHandleAudioBecomingNoisy(boolean handleAudioBecomingNoisy) { public Builder setHandleAudioBecomingNoisy(boolean handleAudioBecomingNoisy) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.handleAudioBecomingNoisy = handleAudioBecomingNoisy; this.handleAudioBecomingNoisy = handleAudioBecomingNoisy;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setSkipSilenceEnabled(boolean)} instead. */
* Sets whether silences silences in the audio stream is enabled. @Deprecated
*
* @param skipSilenceEnabled Whether skipping silences is enabled.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSkipSilenceEnabled(boolean skipSilenceEnabled) { public Builder setSkipSilenceEnabled(boolean skipSilenceEnabled) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.skipSilenceEnabled = skipSilenceEnabled; this.skipSilenceEnabled = skipSilenceEnabled;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setVideoScalingMode(int)} instead. */
* Sets the {@link C.VideoScalingMode} that will be used by the player. @Deprecated
*
* <p>The scaling mode only applies if a {@link MediaCodec}-based video {@link Renderer} is
* enabled and if the output surface is owned by a {@link SurfaceView}.
*
* @param videoScalingMode A {@link C.VideoScalingMode}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) { public Builder setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.videoScalingMode = videoScalingMode; this.videoScalingMode = videoScalingMode;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setVideoChangeFrameRateStrategy(int)} instead. */
* Sets a {@link C.VideoChangeFrameRateStrategy} that will be used by the player when provided @Deprecated
* with a video output {@link Surface}.
*
* <p>The strategy only applies if a {@link MediaCodec}-based video {@link Renderer} is enabled.
* Applications wishing to use {@link Surface#CHANGE_FRAME_RATE_ALWAYS} should set the mode to
* {@link C#VIDEO_CHANGE_FRAME_RATE_STRATEGY_OFF} to disable calls to {@link
* Surface#setFrameRate} from ExoPlayer, and should then call {@link Surface#setFrameRate}
* directly from application code.
*
* @param videoChangeFrameRateStrategy A {@link C.VideoChangeFrameRateStrategy}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setVideoChangeFrameRateStrategy( public Builder setVideoChangeFrameRateStrategy(
@C.VideoChangeFrameRateStrategy int videoChangeFrameRateStrategy) { @C.VideoChangeFrameRateStrategy int videoChangeFrameRateStrategy) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
...@@ -499,44 +331,24 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -499,44 +331,24 @@ public class SimpleExoPlayer extends BasePlayer
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setUseLazyPreparation(boolean)} instead. */
* Sets whether media sources should be initialized lazily. @Deprecated
*
* <p>If false, all initial preparation steps (e.g., manifest loads) happen immediately. If
* true, these initial preparations are triggered only when the player starts buffering the
* media.
*
* @param useLazyPreparation Whether to use lazy preparation.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setUseLazyPreparation(boolean useLazyPreparation) { public Builder setUseLazyPreparation(boolean useLazyPreparation) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.useLazyPreparation = useLazyPreparation; this.useLazyPreparation = useLazyPreparation;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setSeekParameters(SeekParameters)} instead. */
* Sets the parameters that control how seek operations are performed. @Deprecated
*
* @param seekParameters The {@link SeekParameters}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSeekParameters(SeekParameters seekParameters) { public Builder setSeekParameters(SeekParameters seekParameters) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.seekParameters = seekParameters; this.seekParameters = seekParameters;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)} instead. */
* Sets the {@link #seekBack()} increment. @Deprecated
*
* @param seekBackIncrementMs The seek back increment, in milliseconds.
* @return This builder.
* @throws IllegalArgumentException If {@code seekBackIncrementMs} is non-positive.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSeekBackIncrementMs(@IntRange(from = 1) long seekBackIncrementMs) { public Builder setSeekBackIncrementMs(@IntRange(from = 1) long seekBackIncrementMs) {
checkArgument(seekBackIncrementMs > 0); checkArgument(seekBackIncrementMs > 0);
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
...@@ -544,14 +356,8 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -544,14 +356,8 @@ public class SimpleExoPlayer extends BasePlayer
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setSeekForwardIncrementMs(long)} instead. */
* Sets the {@link #seekForward()} increment. @Deprecated
*
* @param seekForwardIncrementMs The seek forward increment, in milliseconds.
* @return This builder.
* @throws IllegalArgumentException If {@code seekForwardIncrementMs} is non-positive.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setSeekForwardIncrementMs(@IntRange(from = 1) long seekForwardIncrementMs) { public Builder setSeekForwardIncrementMs(@IntRange(from = 1) long seekForwardIncrementMs) {
checkArgument(seekForwardIncrementMs > 0); checkArgument(seekForwardIncrementMs > 0);
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
...@@ -559,52 +365,24 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -559,52 +365,24 @@ public class SimpleExoPlayer extends BasePlayer
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setReleaseTimeoutMs(long)} instead. */
* Sets a timeout for calls to {@link #release} and {@link #setForegroundMode}. @Deprecated
*
* <p>If a call to {@link #release} or {@link #setForegroundMode} takes more than {@code
* timeoutMs} to complete, the player will report an error via {@link
* Player.Listener#onPlayerError}.
*
* @param releaseTimeoutMs The release timeout, in milliseconds.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setReleaseTimeoutMs(long releaseTimeoutMs) { public Builder setReleaseTimeoutMs(long releaseTimeoutMs) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.releaseTimeoutMs = releaseTimeoutMs; this.releaseTimeoutMs = releaseTimeoutMs;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setDetachSurfaceTimeoutMs(long)} instead. */
* Sets a timeout for detaching a surface from the player. @Deprecated
*
* <p>If detaching a surface or replacing a surface takes more than {@code
* detachSurfaceTimeoutMs} to complete, the player will report an error via {@link
* Player.Listener#onPlayerError}.
*
* @param detachSurfaceTimeoutMs The timeout for detaching a surface, in milliseconds.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setDetachSurfaceTimeoutMs(long detachSurfaceTimeoutMs) { public Builder setDetachSurfaceTimeoutMs(long detachSurfaceTimeoutMs) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.detachSurfaceTimeoutMs = detachSurfaceTimeoutMs; this.detachSurfaceTimeoutMs = detachSurfaceTimeoutMs;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setPauseAtEndOfMediaItems(boolean)} instead. */
* Sets whether to pause playback at the end of each media item. @Deprecated
*
* <p>This means the player will pause at the end of each window in the current {@link
* #getCurrentTimeline() timeline}. Listeners will be informed by a call to {@link
* Player.Listener#onPlayWhenReadyChanged(boolean, int)} with the reason {@link
* Player#PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM} when this happens.
*
* @param pauseAtEndOfMediaItems Whether to pause playback at the end of each media item.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
public Builder setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) { public Builder setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.pauseAtEndOfMediaItems = pauseAtEndOfMediaItems; this.pauseAtEndOfMediaItems = pauseAtEndOfMediaItems;
...@@ -612,27 +390,18 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -612,27 +390,18 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** /**
* Sets the {@link LivePlaybackSpeedControl} that will control the playback speed when playing * @deprecated Use {@link
* live streams, in order to maintain a steady target offset from the live stream edge. * ExoPlayer.Builder#setLivePlaybackSpeedControl(LivePlaybackSpeedControl)} instead.
*
* @param livePlaybackSpeedControl The {@link LivePlaybackSpeedControl}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/ */
@Deprecated
public Builder setLivePlaybackSpeedControl(LivePlaybackSpeedControl livePlaybackSpeedControl) { public Builder setLivePlaybackSpeedControl(LivePlaybackSpeedControl livePlaybackSpeedControl) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
this.livePlaybackSpeedControl = livePlaybackSpeedControl; this.livePlaybackSpeedControl = livePlaybackSpeedControl;
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#setClock(Clock)} instead. */
* Sets the {@link Clock} that will be used by the player. Should only be set for testing @Deprecated
* purposes.
*
* @param clock A {@link Clock}.
* @return This builder.
* @throws IllegalStateException If {@link #build()} has already been called.
*/
@VisibleForTesting @VisibleForTesting
public Builder setClock(Clock clock) { public Builder setClock(Clock clock) {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
...@@ -640,11 +409,8 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -640,11 +409,8 @@ public class SimpleExoPlayer extends BasePlayer
return this; return this;
} }
/** /** @deprecated Use {@link ExoPlayer.Builder#build()} instead. */
* Builds a {@link SimpleExoPlayer} instance. @Deprecated
*
* @throws IllegalStateException If this method has already been called.
*/
public SimpleExoPlayer build() { public SimpleExoPlayer build() {
Assertions.checkState(!buildCalled); Assertions.checkState(!buildCalled);
buildCalled = true; buildCalled = true;
...@@ -706,6 +472,7 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -706,6 +472,7 @@ public class SimpleExoPlayer extends BasePlayer
/** @deprecated Use the {@link Builder} and pass it to {@link #SimpleExoPlayer(Builder)}. */ /** @deprecated Use the {@link Builder} and pass it to {@link #SimpleExoPlayer(Builder)}. */
@Deprecated @Deprecated
@SuppressWarnings("deprecation")
protected SimpleExoPlayer( protected SimpleExoPlayer(
Context context, Context context,
RenderersFactory renderersFactory, RenderersFactory renderersFactory,
...@@ -730,6 +497,7 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -730,6 +497,7 @@ public class SimpleExoPlayer extends BasePlayer
} }
/** @param builder The {@link Builder} to obtain all construction parameters. */ /** @param builder The {@link Builder} to obtain all construction parameters. */
@SuppressWarnings("deprecation")
protected SimpleExoPlayer(Builder builder) { protected SimpleExoPlayer(Builder builder) {
constructorFinished = new ConditionVariable(); constructorFinished = new ConditionVariable();
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment