From e3548f267c4ae6748c088fdbabd3be15c41e1fee Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 20 Dec 2021 18:00:56 +0000 Subject: [PATCH] Migrate usages of deprecated `MediaSourceFactory` methods PiperOrigin-RevId: 417428182 --- .../com/google/android/exoplayer2/gldemo/MainActivity.java | 4 ++-- .../google/android/exoplayer2/surfacedemo/MainActivity.java | 4 ++-- .../com/google/android/exoplayer2/offline/DownloadHelper.java | 3 ++- .../exoplayer2/source/DefaultMediaSourceFactoryTest.java | 3 +-- .../exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java | 3 +-- .../exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java | 3 +-- .../source/smoothstreaming/DefaultMediaSourceFactoryTest.java | 3 +-- .../android/exoplayer2/playbacktests/gts/DashTestRunner.java | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java index 48c4ee62dc..1f10cd2c59 100644 --- a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java +++ b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java @@ -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(); diff --git a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java index c9abfcef14..4433cf50e5 100644 --- a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java +++ b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java @@ -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(); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java index 83d609b106..5fef7eb30c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java @@ -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); } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java index e580d757be..a177274cb4 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java @@ -81,8 +81,7 @@ public final class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory - .setDrmSessionManager(null) - .setDrmHttpDataSourceFactory(null) + .setDrmSessionManagerProvider(null) .setLoadErrorHandlingPolicy(null) .createMediaSource(mediaItem); diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java index 8a607d9110..622ed4dabf 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java @@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory - .setDrmSessionManager(null) - .setDrmHttpDataSourceFactory(null) + .setDrmSessionManagerProvider(null) .setLoadErrorHandlingPolicy(null) .createMediaSource(mediaItem); diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java index d67c1fb3ea..d42d557340 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java @@ -82,8 +82,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory - .setDrmSessionManager(null) - .setDrmHttpDataSourceFactory(null) + .setDrmSessionManagerProvider(null) .setLoadErrorHandlingPolicy(null) .createMediaSource(mediaItem); diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java index 01face26c6..f81103a54f 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java @@ -93,8 +93,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory - .setDrmSessionManager(null) - .setDrmHttpDataSourceFactory(null) + .setDrmSessionManagerProvider(null) .setLoadErrorHandlingPolicy(null) .createMediaSource(mediaItem); diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java index 181412c51c..b3553d3c1c 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java @@ -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)); }