Commit 82edf01c by olly Committed by Oliver Woodman

Re-use single session when multiSession disabled

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173098862
parent 9306b24c
...@@ -367,10 +367,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -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 ...@@ -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;
......
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