sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 Ian Baker
parent 46ab94bd41
commit e3548f267c
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/com/google/android/exoplayer2/gldemo/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/com/google/android/exoplayer2/surfacedemo/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
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
View file

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

3
library/core/src/test/java/com/google/android/exoplayer2/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
library/dash/src/test/java/com/google/android/exoplayer2/source/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
library/hls/src/test/java/com/google/android/exoplayer2/source/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
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/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
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/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));
} }