Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5fe5076c
authored
Feb 23, 2017
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Clarify naming for ClearKey DRM support
parent
3bb08e58
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
library/src/main/java/com/google/android/exoplayer2/C.java
library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
library/src/main/java/com/google/android/exoplayer2/C.java
View file @
5fe5076c
...
@@ -444,11 +444,11 @@ public final class C {
...
@@ -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
C
ENC
_UUID
=
new
UUID
(
0x1077EFECC0B24D02
L
,
0xACE33C1E52E2FB4B
L
);
public
static
final
UUID
C
LEARKEY
_UUID
=
new
UUID
(
0x1077EFECC0B24D02
L
,
0xACE33C1E52E2FB4B
L
);
/**
/**
* UUID for the Widevine DRM scheme.
* UUID for the Widevine DRM scheme.
...
...
library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View file @
5fe5076c
...
@@ -341,10 +341,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
...
@@ -341,10 +341,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
schemeInitData
=
psshData
;
schemeInitData
=
psshData
;
}
}
}
}
if
(
Util
.
SDK_INT
<
26
&&
C
.
C
ENC
_UUID
.
equals
(
uuid
)
if
(
Util
.
SDK_INT
<
26
&&
C
.
C
LEARKEY
_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 C
DM only accepted "cenc" as the scheme mime type
.
// Prior to API level 26 the C
learKey CDM only accepted "cenc" as the scheme for MP4
.
schemeMimeType
=
CENC_SCHEME_MIME_TYPE
;
schemeMimeType
=
CENC_SCHEME_MIME_TYPE
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment