Skip to content

SDK / exoplayer

Go to a project
Commit 2f731001 by olly Committed by Oliver Woodman
Options

Remove most deprecated ExoPlayerFactory methods 

PiperOrigin-RevId: 369442687
parent b921458e
Inline Side-by-side
Showing with 9 additions and 177 deletions
RELEASENOTES.md
...@@ -73,6 +73,8 @@ ...@@ -73,6 +73,8 @@
* Spherical UI components moved from `video.spherical` package to * Spherical UI components moved from `video.spherical` package to
`ui.spherical` package, and made package private. `ui.spherical` package, and made package private.
* Remove deprecated symbols: * Remove deprecated symbols:
* Remove `ExoPlayerFactory` methods. Use `SimpleExoPlayer.Builder`
instead.
* Remove `Player.DefaultEventListener`. Use `Player.EventListener` * Remove `Player.DefaultEventListener`. Use `Player.EventListener`
instead. instead.
* Remove `DownloadNotificationUtil`. Use `DownloadNotificationHelper` * Remove `DownloadNotificationUtil`. Use `DownloadNotificationHelper`
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
...@@ -16,17 +16,15 @@ ...@@ -16,17 +16,15 @@
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.content.Context; import android.content.Context;
import android.os.Looper;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
/** @deprecated Use {@link SimpleExoPlayer.Builder} or {@link ExoPlayer.Builder} instead. */ /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated @Deprecated
public final class ExoPlayerFactory { public final class ExoPlayerFactory {
...@@ -35,35 +33,6 @@ public final class ExoPlayerFactory { ...@@ -35,35 +33,6 @@ public final class ExoPlayerFactory {
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */ /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated @Deprecated
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
TrackSelector trackSelector,
LoadControl loadControl,
@DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
RenderersFactory renderersFactory =
new DefaultRenderersFactory(context).setExtensionRendererMode(extensionRendererMode);
return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
TrackSelector trackSelector,
LoadControl loadControl,
@DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode,
long allowedVideoJoiningTimeMs) {
RenderersFactory renderersFactory =
new DefaultRenderersFactory(context)
.setExtensionRendererMode(extensionRendererMode)
.setAllowedVideoJoiningTimeMs(allowedVideoJoiningTimeMs);
return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(Context context) { public static SimpleExoPlayer newSimpleInstance(Context context) {
return newSimpleInstance(context, new DefaultTrackSelector(context)); return newSimpleInstance(context, new DefaultTrackSelector(context));
} }
...@@ -87,172 +56,33 @@ public final class ExoPlayerFactory { ...@@ -87,172 +56,33 @@ public final class ExoPlayerFactory {
@Deprecated @Deprecated
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance( public static SimpleExoPlayer newSimpleInstance(
Context context, TrackSelector trackSelector, LoadControl loadControl) {
RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context, Context context,
RenderersFactory renderersFactory, RenderersFactory renderersFactory,
TrackSelector trackSelector, TrackSelector trackSelector,
LoadControl loadControl) { LoadControl loadControl) {
return newSimpleInstance(
context, renderersFactory, trackSelector, loadControl, Util.getCurrentOrMainLooper());
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector,
LoadControl loadControl,
BandwidthMeter bandwidthMeter) {
return newSimpleInstance(
context,
renderersFactory,
trackSelector,
loadControl,
bandwidthMeter,
new AnalyticsCollector(Clock.DEFAULT),
Util.getCurrentOrMainLooper());
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector,
LoadControl loadControl,
AnalyticsCollector analyticsCollector) {
return newSimpleInstance(
context,
renderersFactory,
trackSelector,
loadControl,
analyticsCollector,
Util.getCurrentOrMainLooper());
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector,
LoadControl loadControl,
Looper applicationLooper) {
return newSimpleInstance(
context,
renderersFactory,
trackSelector,
loadControl,
new AnalyticsCollector(Clock.DEFAULT),
applicationLooper);
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static SimpleExoPlayer newSimpleInstance(
Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector,
LoadControl loadControl,
AnalyticsCollector analyticsCollector,
Looper applicationLooper) {
return newSimpleInstance(
context,
renderersFactory,
trackSelector,
loadControl,
DefaultBandwidthMeter.getSingletonInstance(context),
analyticsCollector,
applicationLooper);
}
/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@SuppressWarnings("deprecation")
@Deprecated
public static SimpleExoPlayer newSimpleInstance(
Context context,
RenderersFactory renderersFactory,
TrackSelector trackSelector,
LoadControl loadControl,
BandwidthMeter bandwidthMeter,
AnalyticsCollector analyticsCollector,
Looper applicationLooper) {
return new SimpleExoPlayer( return new SimpleExoPlayer(
context, context,
renderersFactory, renderersFactory,
trackSelector, trackSelector,
new DefaultMediaSourceFactory(context), new DefaultMediaSourceFactory(context),
loadControl, loadControl,
bandwidthMeter, DefaultBandwidthMeter.getSingletonInstance(context),
analyticsCollector, new AnalyticsCollector(Clock.DEFAULT),
/* useLazyPreparation= */ true, /* useLazyPreparation= */ true,
Clock.DEFAULT, Clock.DEFAULT,
applicationLooper); Util.getCurrentOrMainLooper());
}
/** @deprecated Use {@link ExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static ExoPlayer newInstance(
Context context, Renderer[] renderers, TrackSelector trackSelector) {
return newInstance(context, renderers, trackSelector, new DefaultLoadControl());
} }
/** @deprecated Use {@link ExoPlayer.Builder} instead. */ /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
@Deprecated @Deprecated
@SuppressWarnings("deprecation")
public static ExoPlayer newInstance( public static ExoPlayer newInstance(
Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) { Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) {
return newInstance(
context, renderers, trackSelector, loadControl, Util.getCurrentOrMainLooper());
}
/** @deprecated Use {@link ExoPlayer.Builder} instead. */
@Deprecated
@SuppressWarnings("deprecation")
public static ExoPlayer newInstance(
Context context,
Renderer[] renderers,
TrackSelector trackSelector,
LoadControl loadControl,
Looper applicationLooper) {
return newInstance(
context,
renderers,
trackSelector,
loadControl,
DefaultBandwidthMeter.getSingletonInstance(context),
applicationLooper);
}
/** @deprecated Use {@link ExoPlayer.Builder} instead. */
@Deprecated
public static ExoPlayer newInstance(
Context context,
Renderer[] renderers,
TrackSelector trackSelector,
LoadControl loadControl,
BandwidthMeter bandwidthMeter,
Looper applicationLooper) {
return new ExoPlayerImpl( return new ExoPlayerImpl(
renderers, renderers,
trackSelector, trackSelector,
new DefaultMediaSourceFactory(context), new DefaultMediaSourceFactory(context),
loadControl, loadControl,
bandwidthMeter, DefaultBandwidthMeter.getSingletonInstance(context),
/* analyticsCollector= */ null, /* analyticsCollector= */ null,
/* useLazyPreparation= */ true, /* useLazyPreparation= */ true,
SeekParameters.DEFAULT, SeekParameters.DEFAULT,
...@@ -260,7 +90,7 @@ public final class ExoPlayerFactory { ...@@ -260,7 +90,7 @@ public final class ExoPlayerFactory {
ExoPlayer.DEFAULT_RELEASE_TIMEOUT_MS, ExoPlayer.DEFAULT_RELEASE_TIMEOUT_MS,
/* pauseAtEndOfMediaItems= */ false, /* pauseAtEndOfMediaItems= */ false,
Clock.DEFAULT, Clock.DEFAULT,
applicationLooper, Util.getCurrentOrMainLooper(),
/* wrappingPlayer= */ null, /* wrappingPlayer= */ null,
/* additionalPermanentAvailableCommands= */ Player.Commands.EMPTY); /* additionalPermanentAvailableCommands= */ Player.Commands.EMPTY);
} }
......
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