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

Clarify naming for ClearKey DRM support

Browse Source
This commit is contained in:
Oliver Woodman 2017-02-23 14:51:58 +00:00
parent 3bb08e58f6
commit 5fe5076c86
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/src/main/java/com/google/android/exoplayer2/C.java
View File

@ -444,11 +444,11 @@ public final class C {
public static final UUID UUID_NIL = new UUID(0L, 0L); public static final UUID UUID_NIL = new UUID(0L, 0L);
/** /**
* UUID for the * UUID for the ClearKey DRM scheme.
* <a href="https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html">CENC DRM * <p>
* scheme</a>. * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
*/ */
public static final UUID CENC_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL); public static final UUID CLEARKEY_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL);
/** /**
* UUID for the Widevine DRM scheme. * UUID for the Widevine DRM scheme.

4
library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -341,10 +341,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
schemeInitData = psshData; schemeInitData = psshData;
} }
} }
if (Util.SDK_INT < 26 && C.CENC_UUID.equals(uuid) if (Util.SDK_INT < 26 && C.CLEARKEY_UUID.equals(uuid)
&& (MimeTypes.VIDEO_MP4.equals(schemeMimeType) && (MimeTypes.VIDEO_MP4.equals(schemeMimeType)
|| MimeTypes.AUDIO_MP4.equals(schemeMimeType))) { || MimeTypes.AUDIO_MP4.equals(schemeMimeType))) {
// Prior to API level 26 the CDM only accepted "cenc" as the scheme mime type. // Prior to API level 26 the ClearKey CDM only accepted "cenc" as the scheme for MP4.
schemeMimeType = CENC_SCHEME_MIME_TYPE; schemeMimeType = CENC_SCHEME_MIME_TYPE;
} }
} }