sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPE in FrameworkMediaDrm.

Browse source 
Currently causing GTS tests to fail.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=212244198
This commit is contained in:
tonihei 2018-09-10 03:50:17 -07:00 committed by Oliver Woodman
parent b14e0935b1
commit 1a80097308
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
View file

@ -124,20 +124,25 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
byte[] scope, byte[] scope,
@Nullable List<DrmInitData.SchemeData> schemeDatas, @Nullable List<DrmInitData.SchemeData> schemeDatas,
int keyType, int keyType,
HashMap<String, String> optionalParameters) @Nullable HashMap<String, String> optionalParameters)
throws NotProvisionedException { throws NotProvisionedException {
SchemeData schemeData = getSchemeData(uuid, schemeDatas); SchemeData schemeData = null;
byte[] initData = null;
byte[] initData = adjustRequestInitData(uuid, schemeData.data); String mimeType = null;
String mimeType = adjustRequestMimeType(uuid, schemeData.mimeType); if (schemeDatas != null) {
schemeData = getSchemeData(uuid, schemeDatas);
initData = adjustRequestInitData(uuid, schemeData.data);
mimeType = adjustRequestMimeType(uuid, schemeData.mimeType);
}
MediaDrm.KeyRequest request = MediaDrm.KeyRequest request =
mediaDrm.getKeyRequest(scope, initData, mimeType, keyType, optionalParameters); mediaDrm.getKeyRequest(scope, initData, mimeType, keyType, optionalParameters);
byte[] requestData = adjustRequestData(uuid, request.getData()); byte[] requestData = adjustRequestData(uuid, request.getData());
String licenseServerUrl = request.getDefaultUrl(); String licenseServerUrl = request.getDefaultUrl();
if (TextUtils.isEmpty(licenseServerUrl) && !TextUtils.isEmpty(schemeData.licenseServerUrl)) { if (TextUtils.isEmpty(licenseServerUrl)
&& schemeData != null
&& !TextUtils.isEmpty(schemeData.licenseServerUrl)) {
licenseServerUrl = schemeData.licenseServerUrl; licenseServerUrl = schemeData.licenseServerUrl;
} }