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

Ignore all-zero defaultKid

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168259911
This commit is contained in:
olly 2017-09-11 11:34:44 -07:00 committed by Oliver Woodman
parent f9661b5373
commit 0adb4502f6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View file

@ -355,7 +355,7 @@ public class DashManifestParser extends DefaultHandler
if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) { if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
schemeType = xpp.getAttributeValue(null, "value"); schemeType = xpp.getAttributeValue(null, "value");
String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID"); String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
if (defaultKid != null) { if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
UUID keyId = UUID.fromString(defaultKid); UUID keyId = UUID.fromString(defaultKid);
data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null); data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
uuid = C.COMMON_PSSH_UUID; uuid = C.COMMON_PSSH_UUID;