loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-use single session when multiSession disabled

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173098862
This commit is contained in:
olly 2017-10-23 04:16:48 -07:00 committed by Oliver Woodman
parent 9306b24c65
commit 82edf01c22
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -367,10 +367,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
} }
DefaultDrmSession<T> session = null;
byte[] initData = null; byte[] initData = null;
String mimeType = null; String mimeType = null;
if (offlineLicenseKeySetId == null) { if (offlineLicenseKeySetId == null) {
SchemeData data = getSchemeData(drmInitData, uuid); SchemeData data = getSchemeData(drmInitData, uuid);
if (data == null) { if (data == null) {
@ -389,8 +387,12 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
} }
DefaultDrmSession<T> session;
if (!multiSession) { if (!multiSession) {
// Look for an existing session to use. session = sessions.isEmpty() ? null : sessions.get(0);
} else {
// Only use an existing session if it has matching init data.
session = null;
for (DefaultDrmSession<T> existingSession : sessions) { for (DefaultDrmSession<T> existingSession : sessions) {
if (existingSession.hasInitData(initData)) { if (existingSession.hasInitData(initData)) {
session = existingSession; session = existingSession;