loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ExoPlayer.Builder: lazily initialize default components

Browse Source 
Initialize default components lazily in ExoPlayer.Builder to avoid
redundant component instantiations, useful in cases where apps
overwrite default components with ExoPlayer.Builder setters.

The fields in ExoPlayer.Builder are wrapped in a Supplier (rather than
just making then nullable and initializing them in
ExoPlayer.Builder.build()) so that we maintain the proguarding
properties of this class.

PiperOrigin-RevId: 406345976
This commit is contained in:
christosts 2021-10-29 14:31:12 +01:00 committed by Ian Baker
parent 9d5fd4f402
commit 2c98e8bb4f
2 changed files with 90 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
View File

@ -16,6 +16,7 @@
package androidx.media3.exoplayer; package androidx.media3.exoplayer;
import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import android.content.Context; import android.content.Context;
@ -65,6 +66,7 @@ import androidx.media3.exoplayer.video.VideoFrameMetadataListener;
import androidx.media3.exoplayer.video.spherical.CameraMotionListener; import androidx.media3.exoplayer.video.spherical.CameraMotionListener;
import androidx.media3.extractor.DefaultExtractorsFactory; import androidx.media3.extractor.DefaultExtractorsFactory;
import androidx.media3.extractor.ExtractorsFactory; import androidx.media3.extractor.ExtractorsFactory;
import com.google.common.base.Supplier;
import java.util.List; import java.util.List;
/** /**
@ -377,12 +379,12 @@ public interface ExoPlayer extends Player {
/* package */ Clock clock; /* package */ Clock clock;
/* package */ long foregroundModeTimeoutMs; /* package */ long foregroundModeTimeoutMs;
/* package */ RenderersFactory renderersFactory; /* package */ Supplier<RenderersFactory> renderersFactorySupplier;
/* package */ MediaSourceFactory mediaSourceFactory; /* package */ Supplier<MediaSourceFactory> mediaSourceFactorySupplier;
/* package */ TrackSelector trackSelector; /* package */ Supplier<TrackSelector> trackSelectorSupplier;
/* package */ LoadControl loadControl; /* package */ Supplier<LoadControl> loadControlSupplier;
/* package */ BandwidthMeter bandwidthMeter; /* package */ Supplier<BandwidthMeter> bandwidthMeterSupplier;
/* package */ AnalyticsCollector analyticsCollector; /* package */ Supplier<AnalyticsCollector> analyticsCollectorSupplier;
/* package */ Looper looper; /* package */ Looper looper;
@Nullable /* package */ PriorityTaskManager priorityTaskManager; @Nullable /* package */ PriorityTaskManager priorityTaskManager;
/* package */ AudioAttributes audioAttributes; /* package */ AudioAttributes audioAttributes;
@ -448,8 +450,8 @@ public interface ExoPlayer extends Player {
public Builder(Context context) { public Builder(Context context) {
this( this(
context, context,
new DefaultRenderersFactory(context), () -> new DefaultRenderersFactory(context),
new DefaultMediaSourceFactory(context, new DefaultExtractorsFactory())); () -> new DefaultMediaSourceFactory(context, new DefaultExtractorsFactory()));
} }
/** /**
@ -468,8 +470,8 @@ public interface ExoPlayer extends Player {
public Builder(Context context, RenderersFactory renderersFactory) { public Builder(Context context, RenderersFactory renderersFactory) {
this( this(
context, context,
renderersFactory, () -> renderersFactory,
new DefaultMediaSourceFactory(context, new DefaultExtractorsFactory())); () -> new DefaultMediaSourceFactory(context, new DefaultExtractorsFactory()));
} }
/** /**
@ -487,7 +489,7 @@ public interface ExoPlayer extends Player {
*/ */
@UnstableApi @UnstableApi
public Builder(Context context, MediaSourceFactory mediaSourceFactory) { public Builder(Context context, MediaSourceFactory mediaSourceFactory) {
this(context, new DefaultRenderersFactory(context), mediaSourceFactory); this(context, () -> new DefaultRenderersFactory(context), () -> mediaSourceFactory);
} }
/** /**
@ -508,14 +510,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder( public Builder(
Context context, RenderersFactory renderersFactory, MediaSourceFactory mediaSourceFactory) { Context context, RenderersFactory renderersFactory, MediaSourceFactory mediaSourceFactory) {
this( this(context, () -> renderersFactory, () -> mediaSourceFactory);
context,
renderersFactory,
mediaSourceFactory,
new DefaultTrackSelector(context),
new DefaultLoadControl(),
DefaultBandwidthMeter.getSingletonInstance(context),
new AnalyticsCollector(Clock.DEFAULT));
} }
/** /**
@ -542,13 +537,48 @@ public interface ExoPlayer extends Player {
LoadControl loadControl, LoadControl loadControl,
BandwidthMeter bandwidthMeter, BandwidthMeter bandwidthMeter,
AnalyticsCollector analyticsCollector) { AnalyticsCollector analyticsCollector) {
this(
context,
() -> renderersFactory,
() -> mediaSourceFactory,
() -> trackSelector,
() -> loadControl,
() -> bandwidthMeter,
() -> analyticsCollector);
}
private Builder(
Context context,
Supplier<RenderersFactory> renderersFactorySupplier,
Supplier<MediaSourceFactory> mediaSourceFactorySupplier) {
this(
context,
renderersFactorySupplier,
mediaSourceFactorySupplier,
() -> new DefaultTrackSelector(context),
DefaultLoadControl::new,
() -> DefaultBandwidthMeter.getSingletonInstance(context),
/* analyticsCollectorSupplier= */ null);
}
private Builder(
Context context,
Supplier<RenderersFactory> renderersFactorySupplier,
Supplier<MediaSourceFactory> mediaSourceFactorySupplier,
Supplier<TrackSelector> trackSelectorSupplier,
Supplier<LoadControl> loadControlSupplier,
Supplier<BandwidthMeter> bandwidthMeterSupplier,
@Nullable Supplier<AnalyticsCollector> analyticsCollectorSupplier) {
this.context = context; this.context = context;
this.renderersFactory = renderersFactory; this.renderersFactorySupplier = renderersFactorySupplier;
this.mediaSourceFactory = mediaSourceFactory; this.mediaSourceFactorySupplier = mediaSourceFactorySupplier;
this.trackSelector = trackSelector; this.trackSelectorSupplier = trackSelectorSupplier;
this.loadControl = loadControl; this.loadControlSupplier = loadControlSupplier;
this.bandwidthMeter = bandwidthMeter; this.bandwidthMeterSupplier = bandwidthMeterSupplier;
this.analyticsCollector = analyticsCollector; this.analyticsCollectorSupplier =
analyticsCollectorSupplier != null
? analyticsCollectorSupplier
: () -> new AnalyticsCollector(checkNotNull(clock));
looper = Util.getCurrentOrMainLooper(); looper = Util.getCurrentOrMainLooper();
audioAttributes = AudioAttributes.DEFAULT; audioAttributes = AudioAttributes.DEFAULT;
wakeMode = C.WAKE_MODE_NONE; wakeMode = C.WAKE_MODE_NONE;
@ -590,7 +620,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setRenderersFactory(RenderersFactory renderersFactory) { public Builder setRenderersFactory(RenderersFactory renderersFactory) {
checkState(!buildCalled); checkState(!buildCalled);
this.renderersFactory = renderersFactory; this.renderersFactorySupplier = () -> renderersFactory;
return this; return this;
} }
@ -604,7 +634,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) { public Builder setMediaSourceFactory(MediaSourceFactory mediaSourceFactory) {
checkState(!buildCalled); checkState(!buildCalled);
this.mediaSourceFactory = mediaSourceFactory; this.mediaSourceFactorySupplier = () -> mediaSourceFactory;
return this; return this;
} }
@ -618,7 +648,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setTrackSelector(TrackSelector trackSelector) { public Builder setTrackSelector(TrackSelector trackSelector) {
checkState(!buildCalled); checkState(!buildCalled);
this.trackSelector = trackSelector; this.trackSelectorSupplier = () -> trackSelector;
return this; return this;
} }
@ -632,7 +662,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setLoadControl(LoadControl loadControl) { public Builder setLoadControl(LoadControl loadControl) {
checkState(!buildCalled); checkState(!buildCalled);
this.loadControl = loadControl; this.loadControlSupplier = () -> loadControl;
return this; return this;
} }
@ -646,7 +676,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) { public Builder setBandwidthMeter(BandwidthMeter bandwidthMeter) {
checkState(!buildCalled); checkState(!buildCalled);
this.bandwidthMeter = bandwidthMeter; this.bandwidthMeterSupplier = () -> bandwidthMeter;
return this; return this;
} }
@ -675,7 +705,7 @@ public interface ExoPlayer extends Player {
@UnstableApi @UnstableApi
public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) { public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) {
checkState(!buildCalled); checkState(!buildCalled);
this.analyticsCollector = analyticsCollector; this.analyticsCollectorSupplier = () -> analyticsCollector;
return this; return this;
} }

53
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
View File

@ -18,6 +18,7 @@ package androidx.media3.exoplayer;
import static androidx.media3.common.C.TRACK_TYPE_AUDIO; import static androidx.media3.common.C.TRACK_TYPE_AUDIO;
import static androidx.media3.common.C.TRACK_TYPE_CAMERA_MOTION; import static androidx.media3.common.C.TRACK_TYPE_CAMERA_MOTION;
import static androidx.media3.common.C.TRACK_TYPE_VIDEO; import static androidx.media3.common.C.TRACK_TYPE_VIDEO;
import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.exoplayer.Renderer.MSG_SET_AUDIO_ATTRIBUTES; import static androidx.media3.exoplayer.Renderer.MSG_SET_AUDIO_ATTRIBUTES;
import static androidx.media3.exoplayer.Renderer.MSG_SET_AUDIO_SESSION_ID; import static androidx.media3.exoplayer.Renderer.MSG_SET_AUDIO_SESSION_ID;
import static androidx.media3.exoplayer.Renderer.MSG_SET_AUX_EFFECT_INFO; import static androidx.media3.exoplayer.Renderer.MSG_SET_AUX_EFFECT_INFO;
@ -64,7 +65,6 @@ import androidx.media3.common.TrackSelectionParameters;
import androidx.media3.common.TracksInfo; import androidx.media3.common.TracksInfo;
import androidx.media3.common.VideoSize; import androidx.media3.common.VideoSize;
import androidx.media3.common.text.Cue; import androidx.media3.common.text.Cue;
import androidx.media3.common.util.Assertions;
import androidx.media3.common.util.Clock; import androidx.media3.common.util.Clock;
import androidx.media3.common.util.ConditionVariable; import androidx.media3.common.util.ConditionVariable;
import androidx.media3.common.util.Log; import androidx.media3.common.util.Log;
@ -420,12 +420,14 @@ public class SimpleExoPlayer extends BasePlayer
Clock clock, Clock clock,
Looper applicationLooper) { Looper applicationLooper) {
this( this(
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(
.setTrackSelector(trackSelector) context,
.setMediaSourceFactory(mediaSourceFactory) renderersFactory,
.setLoadControl(loadControl) mediaSourceFactory,
.setBandwidthMeter(bandwidthMeter) trackSelector,
.setAnalyticsCollector(analyticsCollector) loadControl,
bandwidthMeter,
analyticsCollector)
.setUseLazyPreparation(useLazyPreparation) .setUseLazyPreparation(useLazyPreparation)
.setClock(clock) .setClock(clock)
.setLooper(applicationLooper)); .setLooper(applicationLooper));
@ -442,7 +444,7 @@ public class SimpleExoPlayer extends BasePlayer
constructorFinished = new ConditionVariable(); constructorFinished = new ConditionVariable();
try { try {
applicationContext = builder.context.getApplicationContext(); applicationContext = builder.context.getApplicationContext();
analyticsCollector = builder.analyticsCollector; analyticsCollector = builder.analyticsCollectorSupplier.get();
priorityTaskManager = builder.priorityTaskManager; priorityTaskManager = builder.priorityTaskManager;
audioAttributes = builder.audioAttributes; audioAttributes = builder.audioAttributes;
videoScalingMode = builder.videoScalingMode; videoScalingMode = builder.videoScalingMode;
@ -454,12 +456,15 @@ public class SimpleExoPlayer extends BasePlayer
listeners = new CopyOnWriteArraySet<>(); listeners = new CopyOnWriteArraySet<>();
Handler eventHandler = new Handler(builder.looper); Handler eventHandler = new Handler(builder.looper);
renderers = renderers =
builder.renderersFactory.createRenderers( builder
eventHandler, .renderersFactorySupplier
componentListener, .get()
componentListener, .createRenderers(
componentListener, eventHandler,
componentListener); componentListener,
componentListener,
componentListener,
componentListener);
// Set initial values. // Set initial values.
volume = 1; volume = 1;
@ -487,10 +492,10 @@ public class SimpleExoPlayer extends BasePlayer
player = player =
new ExoPlayerImpl( new ExoPlayerImpl(
renderers, renderers,
builder.trackSelector, builder.trackSelectorSupplier.get(),
builder.mediaSourceFactory, builder.mediaSourceFactorySupplier.get(),
builder.loadControl, builder.loadControlSupplier.get(),
builder.bandwidthMeter, builder.bandwidthMeterSupplier.get(),
analyticsCollector, analyticsCollector,
builder.useLazyPreparation, builder.useLazyPreparation,
builder.seekParameters, builder.seekParameters,
@ -859,7 +864,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void addAnalyticsListener(AnalyticsListener listener) { public void addAnalyticsListener(AnalyticsListener listener) {
// Don't verify application thread. We allow calls to this method from any thread. // Don't verify application thread. We allow calls to this method from any thread.
Assertions.checkNotNull(listener); checkNotNull(listener);
analyticsCollector.addListener(listener); analyticsCollector.addListener(listener);
} }
@ -885,7 +890,7 @@ public class SimpleExoPlayer extends BasePlayer
return; return;
} }
if (isPriorityTaskManagerRegistered) { if (isPriorityTaskManagerRegistered) {
Assertions.checkNotNull(this.priorityTaskManager).remove(C.PRIORITY_PLAYBACK); checkNotNull(this.priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
} }
if (priorityTaskManager != null && isLoading()) { if (priorityTaskManager != null && isLoading()) {
priorityTaskManager.add(C.PRIORITY_PLAYBACK); priorityTaskManager.add(C.PRIORITY_PLAYBACK);
@ -993,7 +998,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void addListener(Listener listener) { public void addListener(Listener listener) {
Assertions.checkNotNull(listener); checkNotNull(listener);
listeners.add(listener); listeners.add(listener);
EventListener eventListener = listener; EventListener eventListener = listener;
addListener(eventListener); addListener(eventListener);
@ -1003,13 +1008,13 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void addListener(Player.EventListener listener) { public void addListener(Player.EventListener listener) {
// Don't verify application thread. We allow calls to this method from any thread. // Don't verify application thread. We allow calls to this method from any thread.
Assertions.checkNotNull(listener); checkNotNull(listener);
player.addEventListener(listener); player.addEventListener(listener);
} }
@Override @Override
public void removeListener(Listener listener) { public void removeListener(Listener listener) {
Assertions.checkNotNull(listener); checkNotNull(listener);
listeners.remove(listener); listeners.remove(listener);
EventListener eventListener = listener; EventListener eventListener = listener;
removeListener(eventListener); removeListener(eventListener);
@ -1333,7 +1338,7 @@ public class SimpleExoPlayer extends BasePlayer
ownedSurface = null; ownedSurface = null;
} }
if (isPriorityTaskManagerRegistered) { if (isPriorityTaskManagerRegistered) {
Assertions.checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK); checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
isPriorityTaskManagerRegistered = false; isPriorityTaskManagerRegistered = false;
} }
currentCues = Collections.emptyList(); currentCues = Collections.emptyList();