From 691f9c50cf439aec77903d62b5a28314ab33b550 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 --- .../src/main/java/androidx/media3/demo/gl/MainActivity.java | 4 ++-- .../main/java/androidx/media3/demo/surface/MainActivity.java | 4 ++-- .../androidx/media3/exoplayer/offline/DownloadHelper.java | 3 ++- .../exoplayer/source/DefaultMediaSourceFactoryTest.java | 3 +-- .../media3/exoplayer/dash/DefaultMediaSourceFactoryTest.java | 3 +-- .../media3/exoplayer/hls/DefaultMediaSourceFactoryTest.java | 3 +-- .../smoothstreaming/DefaultMediaSourceFactoryTest.java | 3 +-- .../media3/test/exoplayer/playback/gts/DashTestRunner.java | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/demos/gl/src/main/java/androidx/media3/demo/gl/MainActivity.java b/demos/gl/src/main/java/androidx/media3/demo/gl/MainActivity.java index 59f1d48f1d..2331a082aa 100644 --- a/demos/gl/src/main/java/androidx/media3/demo/gl/MainActivity.java +++ b/demos/gl/src/main/java/androidx/media3/demo/gl/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/androidx/media3/demo/surface/MainActivity.java b/demos/surface/src/main/java/androidx/media3/demo/surface/MainActivity.java index c92411ad73..649a38dd95 100644 --- a/demos/surface/src/main/java/androidx/media3/demo/surface/MainActivity.java +++ b/demos/surface/src/main/java/androidx/media3/demo/surface/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/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java index ff98e26cd2..91437361ea 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java @@ -895,7 +895,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/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactoryTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactoryTest.java index 09b45e091b..56cc6722b8 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactoryTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/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/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultMediaSourceFactoryTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultMediaSourceFactoryTest.java index 6b5e5f04e6..4504a91a98 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultMediaSourceFactoryTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/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/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/DefaultMediaSourceFactoryTest.java b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/DefaultMediaSourceFactoryTest.java index 06a7649c8d..912d6163b8 100644 --- a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/DefaultMediaSourceFactoryTest.java +++ b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/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/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/DefaultMediaSourceFactoryTest.java b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/DefaultMediaSourceFactoryTest.java index 7ad7e0d7b5..9a8e9f0f18 100644 --- a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/DefaultMediaSourceFactoryTest.java +++ b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/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/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java b/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java index 9f3f577770..f2b3ec716c 100644 --- a/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java +++ b/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/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)); }