From 0adb4502f6476f83cdbfcc8cfb9e4ba4fbde28ce Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 11 Sep 2017 11:34:44 -0700 Subject: [PATCH] Ignore all-zero defaultKid ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168259911 --- .../exoplayer2/source/dash/manifest/DashManifestParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java index c973db79d7..72faf21b57 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java @@ -355,7 +355,7 @@ public class DashManifestParser extends DefaultHandler if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) { schemeType = xpp.getAttributeValue(null, "value"); 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); data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null); uuid = C.COMMON_PSSH_UUID;