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
d632cb86
authored
Sep 26, 2019
by
aquilescanta
Committed by
Oliver Woodman
Oct 02, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make multisession work well with placeholder session
Issue:#4867 PiperOrigin-RevId: 271404942
parent
f0b9889e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View file @
d632cb86
...
@@ -102,6 +102,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
...
@@ -102,6 +102,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
private
int
prepareCallsCount
;
private
int
prepareCallsCount
;
@Nullable
private
ExoMediaDrm
<
T
>
exoMediaDrm
;
@Nullable
private
ExoMediaDrm
<
T
>
exoMediaDrm
;
@Nullable
private
DefaultDrmSession
<
T
>
placeholderDrmSession
;
@Nullable
private
DefaultDrmSession
<
T
>
placeholderDrmSession
;
@Nullable
private
DefaultDrmSession
<
T
>
noMultiSessionDrmSession
;
@Nullable
private
Looper
playbackLooper
;
@Nullable
private
Looper
playbackLooper
;
private
int
mode
;
private
int
mode
;
@Nullable
private
byte
[]
offlineLicenseKeySetId
;
@Nullable
private
byte
[]
offlineLicenseKeySetId
;
...
@@ -357,9 +358,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
...
@@ -357,9 +358,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
}
}
}
}
DefaultDrmSession
<
T
>
session
;
@Nullable
DefaultDrmSession
<
T
>
session
;
if
(!
multiSession
)
{
if
(!
multiSession
)
{
session
=
sessions
.
isEmpty
()
?
null
:
sessions
.
get
(
0
)
;
session
=
noMultiSessionDrmSession
;
}
else
{
}
else
{
// Only use an existing session if it has matching init data.
// Only use an existing session if it has matching init data.
session
=
null
;
session
=
null
;
...
@@ -374,6 +375,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
...
@@ -374,6 +375,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
if
(
session
==
null
)
{
if
(
session
==
null
)
{
// Create a new session.
// Create a new session.
session
=
createNewDefaultSession
(
schemeDatas
,
/* isPlaceholderSession= */
false
);
session
=
createNewDefaultSession
(
schemeDatas
,
/* isPlaceholderSession= */
false
);
if
(!
multiSession
)
{
noMultiSessionDrmSession
=
session
;
}
sessions
.
add
(
session
);
sessions
.
add
(
session
);
}
}
session
.
acquireReference
();
session
.
acquireReference
();
...
@@ -462,6 +466,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
...
@@ -462,6 +466,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
if
(
placeholderDrmSession
==
drmSession
)
{
if
(
placeholderDrmSession
==
drmSession
)
{
placeholderDrmSession
=
null
;
placeholderDrmSession
=
null
;
}
}
if
(
noMultiSessionDrmSession
==
drmSession
)
{
noMultiSessionDrmSession
=
null
;
}
if
(
provisioningSessions
.
size
()
>
1
&&
provisioningSessions
.
get
(
0
)
==
drmSession
)
{
if
(
provisioningSessions
.
size
()
>
1
&&
provisioningSessions
.
get
(
0
)
==
drmSession
)
{
// Other sessions were waiting for the released session to complete a provision operation.
// Other sessions were waiting for the released session to complete a provision operation.
// We need to have one of those sessions perform the provision operation instead.
// We need to have one of those sessions perform the provision operation instead.
...
...
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