Commit e3548f26 by ibaker Committed by Ian Baker

Migrate usages of deprecated `MediaSourceFactory` methods

PiperOrigin-RevId: 417428182
parent 46ab94bd
......@@ -161,12 +161,12 @@ public final class MainActivity extends Activity {
if (type == C.TYPE_DASH) {
mediaSource =
new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri));
} else if (type == C.TYPE_OTHER) {
mediaSource =
new ProgressiveMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri));
} else {
throw new IllegalStateException();
......
......@@ -206,12 +206,12 @@ public final class MainActivity extends Activity {
if (type == C.TYPE_DASH) {
mediaSource =
new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri));
} else if (type == C.TYPE_OTHER) {
mediaSource =
new ProgressiveMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri));
} else {
throw new IllegalStateException();
......
......@@ -892,7 +892,8 @@ public final class DownloadHelper {
@Nullable DrmSessionManager drmSessionManager) {
return new DefaultMediaSourceFactory(
dataSourceFactory, ExtractorsFactory.EMPTY, /* serverSideDaiMediaSourceFactory= */ null)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(
drmSessionManager != null ? unusedMediaItem -> drmSessionManager : null)
.createMediaSource(mediaItem);
}
......
......@@ -81,8 +81,7 @@ public final class DefaultMediaSourceFactoryTest {
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManager(null)
.setDrmHttpDataSourceFactory(null)
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
......
......@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManager(null)
.setDrmHttpDataSourceFactory(null)
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
......
......@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManager(null)
.setDrmHttpDataSourceFactory(null)
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
......
......@@ -93,8 +93,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource =
defaultMediaSourceFactory
.setDrmSessionManager(null)
.setDrmHttpDataSourceFactory(null)
.setDrmSessionManagerProvider(null)
.setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem);
......
......@@ -332,7 +332,7 @@ import java.util.List;
? this.dataSourceFactory
: new DefaultDataSource.Factory(host);
return new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(MIN_LOADABLE_RETRY_COUNT))
.createMediaSource(MediaItem.fromUri(manifestUrl));
}
......
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