From cfd13ce6d9a67616415f3fc10021b44137e16e12 Mon Sep 17 00:00:00 2001
From: sr1990 <sr1990003@gmail.com>
Date: Sat, 14 May 2022 11:25:32 -0700
Subject: [PATCH 1/2] [DASH][ClearKey] Parse ClearKey license URL in MPD.

---
 .../android/exoplayer2/drm/DrmInitData.java    |  2 +-
 .../dash/manifest/DashManifestParser.java      | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index dddb87e55ac..af50de1e6bc 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -263,7 +263,7 @@ public static final class SchemeData implements Parcelable {
      */
     public final UUID uuid;
     /** The URL of the server to which license requests should be made. May be null if unknown. */
-    @Nullable public final String licenseServerUrl;
+    @Nullable public String licenseServerUrl;
     /** The mimeType of {@link #data}. */
     public final String mimeType;
     /** The initialization data. May be null for scheme support checks only. */
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 5bf2a6e4e78..ca1b7ff738f 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
@@ -429,6 +429,15 @@ protected AdaptationSet parseAdaptationSet(
           drmSchemeType = contentProtection.first;
         }
         if (contentProtection.second != null) {
+          // In case of clear key, update the licence server url of
+          // previously parsed common encryption drmSchemeData.
+          if (drmSchemeType != null && drmSchemeType == "clearkey") {
+            for (int i = 0;i<drmSchemeDatas.size();i++) {
+              if (drmSchemeDatas.get(i).uuid == C.COMMON_PSSH_UUID
+                  && drmSchemeDatas.get(i).licenseServerUrl == null)
+                drmSchemeDatas.get(i).licenseServerUrl = contentProtection.second.licenseServerUrl;
+            }
+          }
           drmSchemeDatas.add(contentProtection.second);
         }
       } else if (XmlPullParserUtil.isStartTag(xpp, "ContentComponent")) {
@@ -597,6 +606,10 @@ protected AdaptationSet buildAdaptationSet(
         case "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed":
           uuid = C.WIDEVINE_UUID;
           break;
+        case "urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e":
+          uuid = C.CLEARKEY_UUID;
+          schemeType = "clearkey";
+          break;
         default:
           break;
       }
@@ -604,7 +617,10 @@ protected AdaptationSet buildAdaptationSet(
 
     do {
       xpp.next();
-      if (XmlPullParserUtil.isStartTag(xpp, "ms:laurl")) {
+      if (XmlPullParserUtil.isStartTag(xpp, "clearkey:Laurl")
+          && xpp.next() == XmlPullParser.TEXT) {
+        licenseServerUrl = xpp.getText();
+      } else if (XmlPullParserUtil.isStartTag(xpp, "ms:laurl")) {
         licenseServerUrl = xpp.getAttributeValue(null, "licenseUrl");
       } else if (data == null
           && XmlPullParserUtil.isStartTagIgnorePrefix(xpp, "pssh")

From c659fe9441d1bce70d5c8b7fa84f991533d61b3f Mon Sep 17 00:00:00 2001
From: sr1990 <sr1990003@gmail.com>
Date: Sun, 15 May 2022 09:26:17 -0700
Subject: [PATCH 2/2] Changing for loop.

---
 .../source/dash/manifest/DashManifestParser.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 ca1b7ff738f..02232296081 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
@@ -432,10 +432,10 @@ protected AdaptationSet parseAdaptationSet(
           // In case of clear key, update the licence server url of
           // previously parsed common encryption drmSchemeData.
           if (drmSchemeType != null && drmSchemeType == "clearkey") {
-            for (int i = 0;i<drmSchemeDatas.size();i++) {
-              if (drmSchemeDatas.get(i).uuid == C.COMMON_PSSH_UUID
-                  && drmSchemeDatas.get(i).licenseServerUrl == null)
-                drmSchemeDatas.get(i).licenseServerUrl = contentProtection.second.licenseServerUrl;
+            for (SchemeData drmSchemeData : drmSchemeDatas) {
+              if (drmSchemeData.uuid == C.COMMON_PSSH_UUID
+                  && drmSchemeData.licenseServerUrl == null)
+                drmSchemeData.licenseServerUrl = contentProtection.second.licenseServerUrl;
             }
           }
           drmSchemeDatas.add(contentProtection.second);