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

Let MediaSourceFactory setDrmSessionManager accept null

Browse source 
Issue: #7168
This commit is contained in:
Oliver Woodman 2020-05-27 21:03:00 +01:00 committed by Andrew Lewis
parent dfc3c507a0
commit 7414a86fe0
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View file

@ -628,7 +628,10 @@ public class PlayerActivity extends AppCompatActivity
@Override @Override
public MediaSourceFactory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) { public MediaSourceFactory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) {
this.drmSessionManager = drmSessionManager; this.drmSessionManager =
drmSessionManager != null
? drmSessionManager
: DrmSessionManager.getDummyDrmSessionManager();
return this; return this;
} }

5
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file

@ -174,7 +174,10 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) { public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) {
Assertions.checkState(!isCreateCalled); Assertions.checkState(!isCreateCalled);
this.drmSessionManager = drmSessionManager; this.drmSessionManager =
drmSessionManager != null
? drmSessionManager
: DrmSessionManager.getDummyDrmSessionManager();
return this; return this;
} }

5
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file

@ -307,7 +307,10 @@ public final class DashMediaSource extends BaseMediaSource {
@Override @Override
public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) { public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) {
Assertions.checkState(!isCreateCalled); Assertions.checkState(!isCreateCalled);
this.drmSessionManager = drmSessionManager; this.drmSessionManager =
drmSessionManager != null
? drmSessionManager
: DrmSessionManager.getDummyDrmSessionManager();
return this; return this;
} }

5
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file

@ -323,7 +323,10 @@ public final class HlsMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) { public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) {
Assertions.checkState(!isCreateCalled); Assertions.checkState(!isCreateCalled);
this.drmSessionManager = drmSessionManager; this.drmSessionManager =
drmSessionManager != null
? drmSessionManager
: DrmSessionManager.getDummyDrmSessionManager();
return this; return this;
} }

5
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file

@ -273,7 +273,10 @@ public final class SsMediaSource extends BaseMediaSource
@Override @Override
public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) { public Factory setDrmSessionManager(DrmSessionManager<?> drmSessionManager) {
Assertions.checkState(!isCreateCalled); Assertions.checkState(!isCreateCalled);
this.drmSessionManager = drmSessionManager; this.drmSessionManager =
drmSessionManager != null
? drmSessionManager
: DrmSessionManager.getDummyDrmSessionManager();
return this; return this;
} }