Commit 7414a86f by Oliver Woodman Committed by Andrew Lewis

Let MediaSourceFactory setDrmSessionManager accept null

Issue: #7168
parent dfc3c507
...@@ -628,7 +628,10 @@ public class PlayerActivity extends AppCompatActivity ...@@ -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;
} }
......
...@@ -174,7 +174,10 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -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;
} }
......
...@@ -307,7 +307,10 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -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;
} }
......
...@@ -323,7 +323,10 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -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;
} }
......
...@@ -273,7 +273,10 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment