Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7414a86f
authored
May 27, 2020
by
Oliver Woodman
Committed by
Andrew Lewis
May 29, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Let MediaSourceFactory setDrmSessionManager accept null
Issue: #7168
parent
dfc3c507
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
5 deletions
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View file @
7414a86f
...
...
@@ -628,7 +628,10 @@ public class PlayerActivity extends AppCompatActivity
@Override
public
MediaSourceFactory
setDrmSessionManager
(
DrmSessionManager
<?>
drmSessionManager
)
{
this
.
drmSessionManager
=
drmSessionManager
;
this
.
drmSessionManager
=
drmSessionManager
!=
null
?
drmSessionManager
:
DrmSessionManager
.
getDummyDrmSessionManager
();
return
this
;
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file @
7414a86f
...
...
@@ -174,7 +174,10 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override
public
Factory
setDrmSessionManager
(
DrmSessionManager
<?>
drmSessionManager
)
{
Assertions
.
checkState
(!
isCreateCalled
);
this
.
drmSessionManager
=
drmSessionManager
;
this
.
drmSessionManager
=
drmSessionManager
!=
null
?
drmSessionManager
:
DrmSessionManager
.
getDummyDrmSessionManager
();
return
this
;
}
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
7414a86f
...
...
@@ -307,7 +307,10 @@ public final class DashMediaSource extends BaseMediaSource {
@Override
public
Factory
setDrmSessionManager
(
DrmSessionManager
<?>
drmSessionManager
)
{
Assertions
.
checkState
(!
isCreateCalled
);
this
.
drmSessionManager
=
drmSessionManager
;
this
.
drmSessionManager
=
drmSessionManager
!=
null
?
drmSessionManager
:
DrmSessionManager
.
getDummyDrmSessionManager
();
return
this
;
}
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
7414a86f
...
...
@@ -323,7 +323,10 @@ public final class HlsMediaSource extends BaseMediaSource
@Override
public
Factory
setDrmSessionManager
(
DrmSessionManager
<?>
drmSessionManager
)
{
Assertions
.
checkState
(!
isCreateCalled
);
this
.
drmSessionManager
=
drmSessionManager
;
this
.
drmSessionManager
=
drmSessionManager
!=
null
?
drmSessionManager
:
DrmSessionManager
.
getDummyDrmSessionManager
();
return
this
;
}
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file @
7414a86f
...
...
@@ -273,7 +273,10 @@ public final class SsMediaSource extends BaseMediaSource
@Override
public
Factory
setDrmSessionManager
(
DrmSessionManager
<?>
drmSessionManager
)
{
Assertions
.
checkState
(!
isCreateCalled
);
this
.
drmSessionManager
=
drmSessionManager
;
this
.
drmSessionManager
=
drmSessionManager
!=
null
?
drmSessionManager
:
DrmSessionManager
.
getDummyDrmSessionManager
();
return
this
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment