Skip to content

SDK / exoplayer

Go to a project
Commit e3548f26 by ibaker Committed by Ian Baker
Options

Migrate usages of deprecated `MediaSourceFactory` methods 

PiperOrigin-RevId: 417428182
parent 46ab94bd
Inline Side-by-side
Showing with 11 additions and 14 deletions
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
...@@ -161,12 +161,12 @@ public final class MainActivity extends Activity { ...@@ -161,12 +161,12 @@ public final class MainActivity extends Activity {
if (type == C.TYPE_DASH) { if (type == C.TYPE_DASH) {
mediaSource = mediaSource =
new DashMediaSource.Factory(dataSourceFactory) new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri)); .createMediaSource(MediaItem.fromUri(uri));
} else if (type == C.TYPE_OTHER) { } else if (type == C.TYPE_OTHER) {
mediaSource = mediaSource =
new ProgressiveMediaSource.Factory(dataSourceFactory) new ProgressiveMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri)); .createMediaSource(MediaItem.fromUri(uri));
} else { } else {
throw new IllegalStateException(); throw new IllegalStateException();
......
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
...@@ -206,12 +206,12 @@ public final class MainActivity extends Activity { ...@@ -206,12 +206,12 @@ public final class MainActivity extends Activity {
if (type == C.TYPE_DASH) { if (type == C.TYPE_DASH) {
mediaSource = mediaSource =
new DashMediaSource.Factory(dataSourceFactory) new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri)); .createMediaSource(MediaItem.fromUri(uri));
} else if (type == C.TYPE_OTHER) { } else if (type == C.TYPE_OTHER) {
mediaSource = mediaSource =
new ProgressiveMediaSource.Factory(dataSourceFactory) new ProgressiveMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.createMediaSource(MediaItem.fromUri(uri)); .createMediaSource(MediaItem.fromUri(uri));
} else { } else {
throw new IllegalStateException(); throw new IllegalStateException();
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
...@@ -892,7 +892,8 @@ public final class DownloadHelper { ...@@ -892,7 +892,8 @@ public final class DownloadHelper {
@Nullable DrmSessionManager drmSessionManager) { @Nullable DrmSessionManager drmSessionManager) {
return new DefaultMediaSourceFactory( return new DefaultMediaSourceFactory(
dataSourceFactory, ExtractorsFactory.EMPTY, /* serverSideDaiMediaSourceFactory= */ null) dataSourceFactory, ExtractorsFactory.EMPTY, /* serverSideDaiMediaSourceFactory= */ null)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(
drmSessionManager != null ? unusedMediaItem -> drmSessionManager : null)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
} }
......
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java
...@@ -81,8 +81,7 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -81,8 +81,7 @@ public final class DefaultMediaSourceFactoryTest {
MediaSource mediaSource = MediaSource mediaSource =
defaultMediaSourceFactory defaultMediaSourceFactory
.setDrmSessionManager(null) .setDrmSessionManagerProvider(null)
.setDrmHttpDataSourceFactory(null)
.setLoadErrorHandlingPolicy(null) .setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java
...@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest { ...@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource = MediaSource mediaSource =
defaultMediaSourceFactory defaultMediaSourceFactory
.setDrmSessionManager(null) .setDrmSessionManagerProvider(null)
.setDrmHttpDataSourceFactory(null)
.setLoadErrorHandlingPolicy(null) .setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java
...@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest { ...@@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource = MediaSource mediaSource =
defaultMediaSourceFactory defaultMediaSourceFactory
.setDrmSessionManager(null) .setDrmSessionManagerProvider(null)
.setDrmHttpDataSourceFactory(null)
.setLoadErrorHandlingPolicy(null) .setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
......
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java
...@@ -93,8 +93,7 @@ public class DefaultMediaSourceFactoryTest { ...@@ -93,8 +93,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource mediaSource = MediaSource mediaSource =
defaultMediaSourceFactory defaultMediaSourceFactory
.setDrmSessionManager(null) .setDrmSessionManagerProvider(null)
.setDrmHttpDataSourceFactory(null)
.setLoadErrorHandlingPolicy(null) .setLoadErrorHandlingPolicy(null)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
...@@ -332,7 +332,7 @@ import java.util.List; ...@@ -332,7 +332,7 @@ import java.util.List;
? this.dataSourceFactory ? this.dataSourceFactory
: new DefaultDataSource.Factory(host); : new DefaultDataSource.Factory(host);
return new DashMediaSource.Factory(dataSourceFactory) return new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager) .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
.setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(MIN_LOADABLE_RETRY_COUNT)) .setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(MIN_LOADABLE_RETRY_COUNT))
.createMediaSource(MediaItem.fromUri(manifestUrl)); .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