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

Merge pull request #837 from superjohan:fix/android-14-clearkey

Browse source 
PiperOrigin-RevId: 585639025
(cherry picked from commit 5f27b18210)
This commit is contained in:
Copybara-Service 2023-11-27 06:56:45 -08:00 committed by microkatz
parent 19ee78729c
commit db648316ed
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASENOTES.md
View file

@ -21,6 +21,9 @@
* Text: * Text:
* Metadata: * Metadata:
* DRM: * DRM:
* Extend workaround for spurious ClearKey `https://default.url` license
URL to API 33+ (previously the workaround only applied on API 33
exactly) ([#837](https://github.com/androidx/media/pull/837)).
* Effect: * Effect:
* Muxers: * Muxers:
* IMA extension: * IMA extension:

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
View file

@ -246,7 +246,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
private static String adjustLicenseServerUrl(String licenseServerUrl) { private static 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)) { } else if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) {
// Work around b/247808112 // Work around b/247808112
return ""; return "";
} else { } else {