loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tighten clearkey "default.url" workaround

Browse Source 
This ensures it only applies to known-problematic versions of the
clearkey plugin.

PiperOrigin-RevId: 624901919
This commit is contained in:
ibaker 2024-04-15 03:40:06 -07:00 committed by Copybara-Service
parent 11257ecacb
commit a701c2f035
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
View File

@ -49,6 +49,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
/** An {@link ExoMediaDrm} implementation that wraps the framework {@link MediaDrm}. */ /** An {@link ExoMediaDrm} implementation that wraps the framework {@link MediaDrm}. */
@ -242,15 +243,18 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
return new KeyRequest(requestData, licenseServerUrl, requestType); return new KeyRequest(requestData, licenseServerUrl, requestType);
} }
private static String adjustLicenseServerUrl(String licenseServerUrl) { private String adjustLicenseServerUrl(String licenseServerUrl) {
if (MOCK_LA_URL.equals(licenseServerUrl)) { if (MOCK_LA_URL.equals(licenseServerUrl)) {
return ""; return "";
} else if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) {
// Work around b/247808112
return "";
} else {
return licenseServerUrl;
} }
if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) {
// Work around b/247808112
String pluginVersion = getPropertyString("version");
if (Objects.equals(pluginVersion, "1.2") || Objects.equals(pluginVersion, "aidl-1")) {
return "";
}
}
return licenseServerUrl;
} }
@UnstableApi @UnstableApi