loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate usages of deprecated MediaSourceFactory methods

Browse Source 
PiperOrigin-RevId: 417428182
This commit is contained in:
ibaker 2021-12-20 18:00:56 +00:00 committed by tonihei
parent 9dae5fd2c0
commit 691f9c50cf
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gl/src/main/java/androidx/media3/demo/gl/MainActivity.java
View File

@ -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();

4
demos/surface/src/main/java/androidx/media3/demo/surface/MainActivity.java
View File

@ -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();

3
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java
View File

@ -895,7 +895,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);
} }

3
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactoryTest.java
View File

@ -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);

3
libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultMediaSourceFactoryTest.java
View File

@ -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);

3
libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/DefaultMediaSourceFactoryTest.java
View File

@ -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);

3
libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/DefaultMediaSourceFactoryTest.java
View File

@ -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);

2
libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java
View File

@ -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));
} }