Skip to content

SDK / exoplayer

Go to a project
Commit 274f3a13 by ibaker Committed by Ian Baker
Options

Rollback of 57182ac7 

*** Original commit ***

Remove `@Nullable` from `MediaSource.Factory` setters

The null-behaviour of these methods creates a minimization footgun,
because **any** call to these setters will prevent R8 from removing
the default implementation (even if it's never used by the app) - this
is because R8 can't tell the default implementation is only used if the
parameter is `null`.

******

PiperOrigin-RevId: 450410833
parent 4277ac38
Inline Side-by-side
Showing with 167 additions and 186 deletions
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java
...@@ -134,14 +134,14 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou ...@@ -134,14 +134,14 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou
@Override @Override
public MediaSource.Factory setLoadErrorHandlingPolicy( public MediaSource.Factory setLoadErrorHandlingPolicy(
LoadErrorHandlingPolicy loadErrorHandlingPolicy) { @Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
contentMediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy); contentMediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy);
return this; return this;
} }
@Override @Override
public MediaSource.Factory setDrmSessionManagerProvider( public MediaSource.Factory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
contentMediaSourceFactory.setDrmSessionManagerProvider(drmSessionManagerProvider); contentMediaSourceFactory.setDrmSessionManagerProvider(drmSessionManagerProvider);
return this; return this;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
...@@ -949,12 +949,10 @@ public final class DownloadHelper { ...@@ -949,12 +949,10 @@ public final class DownloadHelper {
MediaItem mediaItem, MediaItem mediaItem,
DataSource.Factory dataSourceFactory, DataSource.Factory dataSourceFactory,
@Nullable DrmSessionManager drmSessionManager) { @Nullable DrmSessionManager drmSessionManager) {
DefaultMediaSourceFactory mediaSourceFactory = return new DefaultMediaSourceFactory(dataSourceFactory, ExtractorsFactory.EMPTY)
new DefaultMediaSourceFactory(dataSourceFactory, ExtractorsFactory.EMPTY); .setDrmSessionManagerProvider(
if (drmSessionManager != null) { drmSessionManager != null ? unusedMediaItem -> drmSessionManager : null)
mediaSourceFactory.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager); .createMediaSource(mediaItem);
}
return mediaSourceFactory.createMediaSource(mediaItem);
} }
private static boolean isProgressive(MediaItem.LocalConfiguration localConfiguration) { private static boolean isProgressive(MediaItem.LocalConfiguration localConfiguration) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
...@@ -331,25 +331,15 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { ...@@ -331,25 +331,15 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
@Override @Override
public DefaultMediaSourceFactory setDrmSessionManagerProvider( public DefaultMediaSourceFactory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
delegateFactoryLoader.setDrmSessionManagerProvider( delegateFactoryLoader.setDrmSessionManagerProvider(drmSessionManagerProvider);
checkNotNull(
drmSessionManagerProvider,
"MediaSource.Factory#setDrmSessionManagerProvider no longer handles null by"
+ " instantiating a new DefaultDrmSessionManagerProvider. Explicitly construct and"
+ " pass an instance in order to retain the old behavior."));
return this; return this;
} }
@Override @Override
public DefaultMediaSourceFactory setLoadErrorHandlingPolicy( public DefaultMediaSourceFactory setLoadErrorHandlingPolicy(
LoadErrorHandlingPolicy loadErrorHandlingPolicy) { @Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
checkNotNull(
loadErrorHandlingPolicy,
"MediaSource.Factory#setLoadErrorHandlingPolicy no longer handles null by"
+ " instantiating a new DefaultLoadErrorHandlingPolicy. Explicitly construct and"
+ " pass an instance in order to retain the old behavior.");
delegateFactoryLoader.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy); delegateFactoryLoader.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy);
return this; return this;
} }
...@@ -424,23 +414,16 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { ...@@ -424,23 +414,16 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
SubtitleDecoderFactory.DEFAULT.createDecoder(format), format) SubtitleDecoderFactory.DEFAULT.createDecoder(format), format)
: new UnknownSubtitlesExtractor(format) : new UnknownSubtitlesExtractor(format)
}; };
ProgressiveMediaSource.Factory progressiveMediaSourceFactory =
new ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory);
if (loadErrorHandlingPolicy != null) {
progressiveMediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy);
}
mediaSources[i + 1] = mediaSources[i + 1] =
progressiveMediaSourceFactory.createMediaSource( new ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory)
.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
.createMediaSource(
MediaItem.fromUri(subtitleConfigurations.get(i).uri.toString())); MediaItem.fromUri(subtitleConfigurations.get(i).uri.toString()));
} else { } else {
SingleSampleMediaSource.Factory singleSampleMediaSourceFactory =
new SingleSampleMediaSource.Factory(dataSourceFactory);
if (loadErrorHandlingPolicy != null) {
singleSampleMediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy);
}
mediaSources[i + 1] = mediaSources[i + 1] =
singleSampleMediaSourceFactory.createMediaSource( new SingleSampleMediaSource.Factory(dataSourceFactory)
subtitleConfigurations.get(i), /* durationUs= */ C.TIME_UNSET); .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
.createMediaSource(subtitleConfigurations.get(i), /* durationUs= */ C.TIME_UNSET);
} }
} }
...@@ -549,14 +532,16 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { ...@@ -549,14 +532,16 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
return mediaSourceFactory; return mediaSourceFactory;
} }
public void setDrmSessionManagerProvider(DrmSessionManagerProvider drmSessionManagerProvider) { public void setDrmSessionManagerProvider(
@Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
this.drmSessionManagerProvider = drmSessionManagerProvider; this.drmSessionManagerProvider = drmSessionManagerProvider;
for (MediaSource.Factory mediaSourceFactory : mediaSourceFactories.values()) { for (MediaSource.Factory mediaSourceFactory : mediaSourceFactories.values()) {
mediaSourceFactory.setDrmSessionManagerProvider(drmSessionManagerProvider); mediaSourceFactory.setDrmSessionManagerProvider(drmSessionManagerProvider);
} }
} }
public void setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { public void setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = loadErrorHandlingPolicy; this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
for (MediaSource.Factory mediaSourceFactory : mediaSourceFactories.values()) { for (MediaSource.Factory mediaSourceFactory : mediaSourceFactories.values()) {
mediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy); mediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy);
......
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
...@@ -22,10 +22,12 @@ import com.google.android.exoplayer2.ExoPlayer; ...@@ -22,10 +22,12 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId; import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManagerProvider;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.DrmSessionManagerProvider; import com.google.android.exoplayer2.drm.DrmSessionManagerProvider;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy; import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import java.io.IOException; import java.io.IOException;
...@@ -65,16 +67,21 @@ public interface MediaSource { ...@@ -65,16 +67,21 @@ public interface MediaSource {
* Sets the {@link DrmSessionManagerProvider} used to obtain a {@link DrmSessionManager} for a * Sets the {@link DrmSessionManagerProvider} used to obtain a {@link DrmSessionManager} for a
* {@link MediaItem}. * {@link MediaItem}.
* *
* <p>If not set, {@link DefaultDrmSessionManagerProvider} is used.
*
* @return This factory, for convenience. * @return This factory, for convenience.
*/ */
Factory setDrmSessionManagerProvider(DrmSessionManagerProvider drmSessionManagerProvider); Factory setDrmSessionManagerProvider(
@Nullable DrmSessionManagerProvider drmSessionManagerProvider);
/** /**
* Sets an optional {@link LoadErrorHandlingPolicy}. * Sets an optional {@link LoadErrorHandlingPolicy}.
* *
* @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}, or {@code null} to use the
* {@link DefaultLoadErrorHandlingPolicy}.
* @return This factory, for convenience. * @return This factory, for convenience.
*/ */
Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy); Factory setLoadErrorHandlingPolicy(@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy);
/** /**
* Returns the {@link C.ContentType content types} supported by media sources created by this * Returns the {@link C.ContentType content types} supported by media sources created by this
......
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
...@@ -63,18 +63,10 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -63,18 +63,10 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Nullable private Object tag; @Nullable private Object tag;
/** /**
* Creates a new factory for {@link ProgressiveMediaSource}s. * Creates a new factory for {@link ProgressiveMediaSource}s, using the extractors provided by
* * {@link DefaultExtractorsFactory}.
* <p>The factory will use the following default components:
* *
* <ul> * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
* <li>{@link DefaultExtractorsFactory}
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* </ul>
*
* @param dataSourceFactory A factory for {@linkplain DataSource data sources} to read the
* media.
*/ */
public Factory(DataSource.Factory dataSourceFactory) { public Factory(DataSource.Factory dataSourceFactory) {
this(dataSourceFactory, new DefaultExtractorsFactory()); this(dataSourceFactory, new DefaultExtractorsFactory());
...@@ -83,18 +75,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -83,18 +75,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource
/** /**
* Equivalent to {@link #Factory(DataSource.Factory, ProgressiveMediaExtractor.Factory) new * Equivalent to {@link #Factory(DataSource.Factory, ProgressiveMediaExtractor.Factory) new
* Factory(dataSourceFactory, () -> new BundledExtractorsAdapter(extractorsFactory)}. * Factory(dataSourceFactory, () -> new BundledExtractorsAdapter(extractorsFactory)}.
*
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* </ul>
*
* @param dataSourceFactory A factory for {@linkplain DataSource data sources} to read the
* media.
* @param extractorsFactory A factory for the {@linkplain Extractor extractors} used to extract
* the media from its container.
*/ */
public Factory(DataSource.Factory dataSourceFactory, ExtractorsFactory extractorsFactory) { public Factory(DataSource.Factory dataSourceFactory, ExtractorsFactory extractorsFactory) {
this(dataSourceFactory, playerId -> new BundledExtractorsAdapter(extractorsFactory)); this(dataSourceFactory, playerId -> new BundledExtractorsAdapter(extractorsFactory));
...@@ -103,17 +83,9 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -103,17 +83,9 @@ public final class ProgressiveMediaSource extends BaseMediaSource
/** /**
* Creates a new factory for {@link ProgressiveMediaSource}s. * Creates a new factory for {@link ProgressiveMediaSource}s.
* *
* <p>The factory will use the following default components: * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* </ul>
*
* @param dataSourceFactory A factory for {@linkplain DataSource data sources} to read the
* media.
* @param progressiveMediaExtractorFactory A factory for the {@link ProgressiveMediaExtractor} * @param progressiveMediaExtractorFactory A factory for the {@link ProgressiveMediaExtractor}
* to extract the media from its container. * to extract media from its container.
*/ */
public Factory( public Factory(
DataSource.Factory dataSourceFactory, DataSource.Factory dataSourceFactory,
...@@ -129,8 +101,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -129,8 +101,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
/** /**
* Creates a new factory for {@link ProgressiveMediaSource}s. * Creates a new factory for {@link ProgressiveMediaSource}s.
* *
* @param dataSourceFactory A factory for {@linkplain DataSource data sources} to read the * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
* media.
* @param progressiveMediaExtractorFactory A factory for the {@link ProgressiveMediaExtractor} * @param progressiveMediaExtractorFactory A factory for the {@link ProgressiveMediaExtractor}
* to extract media from its container. * to extract media from its container.
* @param drmSessionManagerProvider A provider to obtain a {@link DrmSessionManager} for a * @param drmSessionManagerProvider A provider to obtain a {@link DrmSessionManager} for a
...@@ -153,14 +124,19 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -153,14 +124,19 @@ public final class ProgressiveMediaSource extends BaseMediaSource
this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes; this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
} }
@Override /**
public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link
* DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}.
*
* @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}.
* @return This factory, for convenience.
*/
public Factory setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = this.loadErrorHandlingPolicy =
checkNotNull( loadErrorHandlingPolicy != null
loadErrorHandlingPolicy, ? loadErrorHandlingPolicy
"MediaSource.Factory#setLoadErrorHandlingPolicy no longer handles null by" : new DefaultLoadErrorHandlingPolicy();
+ " instantiating a new DefaultLoadErrorHandlingPolicy. Explicitly construct and"
+ " pass an instance in order to retain the old behavior.");
return this; return this;
} }
...@@ -181,13 +157,11 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -181,13 +157,11 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManagerProvider( public Factory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
this.drmSessionManagerProvider = this.drmSessionManagerProvider =
checkNotNull( drmSessionManagerProvider != null
drmSessionManagerProvider, ? drmSessionManagerProvider
"MediaSource.Factory#setDrmSessionManagerProvider no longer handles null by" : new DefaultDrmSessionManagerProvider();
+ " instantiating a new DefaultDrmSessionManagerProvider. Explicitly construct"
+ " and pass an instance in order to retain the old behavior.");
return this; return this;
} }
......
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java
...@@ -74,6 +74,21 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -74,6 +74,21 @@ public final class DefaultMediaSourceFactoryTest {
} }
@Test @Test
public void createMediaSource_withNull_usesNonNullDefaults() {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA).build();
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
assertThat(mediaSource).isNotNull();
}
@Test
public void createMediaSource_withSubtitle_isMergingMediaSource() { public void createMediaSource_withSubtitle_isMergingMediaSource() {
DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()); new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -112,15 +112,6 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -112,15 +112,6 @@ public final class DashMediaSource extends BaseMediaSource {
/** /**
* Creates a new factory for {@link DashMediaSource}s. * Creates a new factory for {@link DashMediaSource}s.
* *
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultDashChunkSource.Factory}
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
*
* @param dataSourceFactory A factory for {@link DataSource} instances that will be used to load * @param dataSourceFactory A factory for {@link DataSource} instances that will be used to load
* manifest and media data. * manifest and media data.
*/ */
...@@ -131,14 +122,6 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -131,14 +122,6 @@ public final class DashMediaSource extends BaseMediaSource {
/** /**
* Creates a new factory for {@link DashMediaSource}s. * Creates a new factory for {@link DashMediaSource}s.
* *
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
*
* @param chunkSourceFactory A factory for {@link DashChunkSource} instances. * @param chunkSourceFactory A factory for {@link DashChunkSource} instances.
* @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used * @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used
* to load (and refresh) the manifest. May be {@code null} if the factory will only ever be * to load (and refresh) the manifest. May be {@code null} if the factory will only ever be
...@@ -158,24 +141,27 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -158,24 +141,27 @@ public final class DashMediaSource extends BaseMediaSource {
@Override @Override
public Factory setDrmSessionManagerProvider( public Factory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
this.drmSessionManagerProvider = this.drmSessionManagerProvider =
checkNotNull( drmSessionManagerProvider != null
drmSessionManagerProvider, ? drmSessionManagerProvider
"MediaSource.Factory#setDrmSessionManagerProvider no longer handles null by" : new DefaultDrmSessionManagerProvider();
+ " instantiating a new DefaultDrmSessionManagerProvider. Explicitly construct"
+ " and pass an instance in order to retain the old behavior.");
return this; return this;
} }
@Override /**
public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link
* DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}.
*
* @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}.
* @return This factory, for convenience.
*/
public Factory setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = this.loadErrorHandlingPolicy =
checkNotNull( loadErrorHandlingPolicy != null
loadErrorHandlingPolicy, ? loadErrorHandlingPolicy
"MediaSource.Factory#setLoadErrorHandlingPolicy no longer handles null by" : new DefaultLoadErrorHandlingPolicy();
+ " instantiating a new DefaultLoadErrorHandlingPolicy. Explicitly construct and"
+ " pass an instance in order to retain the old behavior.");
return this; return this;
} }
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java
...@@ -75,6 +75,21 @@ public class DefaultMediaSourceFactoryTest { ...@@ -75,6 +75,21 @@ public class DefaultMediaSourceFactoryTest {
} }
@Test @Test
public void createMediaSource_withNull_usesNonNullDefaults() {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA + "/file.mpd").build();
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
assertThat(mediaSource).isNotNull();
}
@Test
public void getSupportedTypes_dashModule_containsTypeDash() { public void getSupportedTypes_dashModule_containsTypeDash() {
int[] supportedTypes = int[] supportedTypes =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()) new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext())
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
...@@ -112,17 +112,6 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -112,17 +112,6 @@ public final class HlsMediaSource extends BaseMediaSource
/** /**
* Creates a new factory for {@link HlsMediaSource}s. * Creates a new factory for {@link HlsMediaSource}s.
* *
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultHlsPlaylistParserFactory}
* <li>{@link DefaultHlsPlaylistTracker#FACTORY}
* <li>{@link HlsExtractorFactory#DEFAULT}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
*
* @param dataSourceFactory A data source factory that will be wrapped by a {@link * @param dataSourceFactory A data source factory that will be wrapped by a {@link
* DefaultHlsDataSourceFactory} to create {@link DataSource}s for manifests, segments and * DefaultHlsDataSourceFactory} to create {@link DataSource}s for manifests, segments and
* keys. * keys.
...@@ -134,17 +123,6 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -134,17 +123,6 @@ public final class HlsMediaSource extends BaseMediaSource
/** /**
* Creates a new factory for {@link HlsMediaSource}s. * Creates a new factory for {@link HlsMediaSource}s.
* *
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultHlsPlaylistParserFactory}
* <li>{@link DefaultHlsPlaylistTracker#FACTORY}
* <li>{@link HlsExtractorFactory#DEFAULT}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
*
* @param hlsDataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for * @param hlsDataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for
* manifests, segments and keys. * manifests, segments and keys.
*/ */
...@@ -175,14 +153,19 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -175,14 +153,19 @@ public final class HlsMediaSource extends BaseMediaSource
return this; return this;
} }
@Override /**
public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link
* DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}.
*
* @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}.
* @return This factory, for convenience.
*/
public Factory setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = this.loadErrorHandlingPolicy =
checkNotNull( loadErrorHandlingPolicy != null
loadErrorHandlingPolicy, ? loadErrorHandlingPolicy
"MediaSource.Factory#setLoadErrorHandlingPolicy no longer handles null by" : new DefaultLoadErrorHandlingPolicy();
+ " instantiating a new DefaultLoadErrorHandlingPolicy. Explicitly construct and"
+ " pass an instance in order to retain the old behavior.");
return this; return this;
} }
...@@ -291,13 +274,11 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -291,13 +274,11 @@ public final class HlsMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManagerProvider( public Factory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
this.drmSessionManagerProvider = this.drmSessionManagerProvider =
checkNotNull( drmSessionManagerProvider != null
drmSessionManagerProvider, ? drmSessionManagerProvider
"MediaSource.Factory#setDrmSessionManagerProvider no longer handles null by" : new DefaultDrmSessionManagerProvider();
+ " instantiating a new DefaultDrmSessionManagerProvider. Explicitly construct"
+ " and pass an instance in order to retain the old behavior.");
return this; return this;
} }
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java
...@@ -75,6 +75,21 @@ public class DefaultMediaSourceFactoryTest { ...@@ -75,6 +75,21 @@ public class DefaultMediaSourceFactoryTest {
} }
@Test @Test
public void createMediaSource_withNull_usesNonNullDefaults() {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA + "/file.m3u8").build();
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
assertThat(mediaSource).isNotNull();
}
@Test
public void getSupportedTypes_hlsModule_containsTypeHls() { public void getSupportedTypes_hlsModule_containsTypeHls() {
int[] supportedTypes = int[] supportedTypes =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()) new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext())
......
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java
...@@ -146,13 +146,15 @@ public final class RtspMediaSource extends BaseMediaSource { ...@@ -146,13 +146,15 @@ public final class RtspMediaSource extends BaseMediaSource {
/** Does nothing. {@link RtspMediaSource} does not support DRM. */ /** Does nothing. {@link RtspMediaSource} does not support DRM. */
@Override @Override
public Factory setDrmSessionManagerProvider(DrmSessionManagerProvider drmSessionManager) { public Factory setDrmSessionManagerProvider(
@Nullable DrmSessionManagerProvider drmSessionManager) {
return this; return this;
} }
/** Does nothing. {@link RtspMediaSource} does not support error handling policies. */ /** Does nothing. {@link RtspMediaSource} does not support error handling policies. */
@Override @Override
public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { public Factory setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
// TODO(internal b/172331505): Implement support. // TODO(internal b/172331505): Implement support.
return this; return this;
} }
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -91,15 +91,6 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -91,15 +91,6 @@ public final class SsMediaSource extends BaseMediaSource
/** /**
* Creates a new factory for {@link SsMediaSource}s. * Creates a new factory for {@link SsMediaSource}s.
* *
* <p>The factory will use the following default components:
*
* <ul>
* <li>{@link DefaultSsChunkSource.Factory}
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
*
* @param dataSourceFactory A factory for {@link DataSource} instances that will be used to load * @param dataSourceFactory A factory for {@link DataSource} instances that will be used to load
* manifest and media data. * manifest and media data.
*/ */
...@@ -108,14 +99,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -108,14 +99,7 @@ public final class SsMediaSource extends BaseMediaSource
} }
/** /**
* Creates a new factory for {@link SsMediaSource}s. The factory will use the following default * Creates a new factory for {@link SsMediaSource}s.
* components:
*
* <ul>
* <li>{@link DefaultDrmSessionManagerProvider}
* <li>{@link DefaultLoadErrorHandlingPolicy}
* <li>{@link DefaultCompositeSequenceableLoaderFactory}
* </ul>
* *
* @param chunkSourceFactory A factory for {@link SsChunkSource} instances. * @param chunkSourceFactory A factory for {@link SsChunkSource} instances.
* @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used * @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used
...@@ -134,14 +118,19 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -134,14 +118,19 @@ public final class SsMediaSource extends BaseMediaSource
compositeSequenceableLoaderFactory = new DefaultCompositeSequenceableLoaderFactory(); compositeSequenceableLoaderFactory = new DefaultCompositeSequenceableLoaderFactory();
} }
@Override /**
public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandlingPolicy) { * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link
* DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}.
*
* @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}.
* @return This factory, for convenience.
*/
public Factory setLoadErrorHandlingPolicy(
@Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
this.loadErrorHandlingPolicy = this.loadErrorHandlingPolicy =
checkNotNull( loadErrorHandlingPolicy != null
loadErrorHandlingPolicy, ? loadErrorHandlingPolicy
"MediaSource.Factory#setLoadErrorHandlingPolicy no longer handles null by" : new DefaultLoadErrorHandlingPolicy();
+ " instantiating a new DefaultLoadErrorHandlingPolicy. Explicitly construct and"
+ " pass an instance in order to retain the old behavior.");
return this; return this;
} }
...@@ -193,13 +182,11 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -193,13 +182,11 @@ public final class SsMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManagerProvider( public Factory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
this.drmSessionManagerProvider = this.drmSessionManagerProvider =
checkNotNull( drmSessionManagerProvider != null
drmSessionManagerProvider, ? drmSessionManagerProvider
"MediaSource.Factory#setDrmSessionManagerProvider no longer handles null by" : new DefaultDrmSessionManagerProvider();
+ " instantiating a new DefaultDrmSessionManagerProvider. Explicitly construct"
+ " and pass an instance in order to retain the old behavior.");
return this; return this;
} }
......
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java
...@@ -86,6 +86,21 @@ public class DefaultMediaSourceFactoryTest { ...@@ -86,6 +86,21 @@ public class DefaultMediaSourceFactoryTest {
} }
@Test @Test
public void createMediaSource_withNull_usesNonNullDefaults() {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA + "/file.ism").build();
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
assertThat(mediaSource).isNotNull();
}
@Test
public void getSupportedTypes_smoothstreamingModule_containsTypeSS() { public void getSupportedTypes_smoothstreamingModule_containsTypeSS() {
int[] supportedTypes = int[] supportedTypes =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()) new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext())
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactory.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.testutil; package com.google.android.exoplayer2.testutil;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.drm.DrmSessionManagerProvider; import com.google.android.exoplayer2.drm.DrmSessionManagerProvider;
...@@ -36,13 +37,13 @@ public final class FakeMediaSourceFactory implements MediaSourceFactory { ...@@ -36,13 +37,13 @@ public final class FakeMediaSourceFactory implements MediaSourceFactory {
@Override @Override
public MediaSourceFactory setDrmSessionManagerProvider( public MediaSourceFactory setDrmSessionManagerProvider(
DrmSessionManagerProvider drmSessionManagerProvider) { @Nullable DrmSessionManagerProvider drmSessionManagerProvider) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override @Override
public MediaSourceFactory setLoadErrorHandlingPolicy( public MediaSourceFactory setLoadErrorHandlingPolicy(
LoadErrorHandlingPolicy loadErrorHandlingPolicy) { @Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
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