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
5c4b8085
authored
Jul 14, 2020
by
ibaker
Committed by
Oliver Woodman
Jul 24, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Migrate usages of DefaultDrmSessionManager constructor to Builder
PiperOrigin-RevId: 321174738
parent
2f19b63c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
22 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View file @
5c4b8085
...
@@ -326,6 +326,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
...
@@ -326,6 +326,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
* Default is false.
* Default is false.
* @deprecated Use {@link Builder} instead.
* @deprecated Use {@link Builder} instead.
*/
*/
@SuppressWarnings
(
"deprecation"
)
@Deprecated
@Deprecated
public
DefaultDrmSessionManager
(
public
DefaultDrmSessionManager
(
UUID
uuid
,
UUID
uuid
,
...
...
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View file @
5c4b8085
...
@@ -262,29 +262,29 @@ import java.util.List;
...
@@ -262,29 +262,29 @@ import java.util.List;
if
(
widevineLicenseUrl
==
null
)
{
if
(
widevineLicenseUrl
==
null
)
{
return
DrmSessionManager
.
getDummyDrmSessionManager
();
return
DrmSessionManager
.
getDummyDrmSessionManager
();
}
}
try
{
MediaDrmCallback
drmCallback
=
MediaDrmCallback
drmCallback
=
new
HttpMediaDrmCallback
(
widevineLicenseUrl
,
new
HttpMediaDrmCallback
(
widevineLicenseUrl
,
new
DefaultHttpDataSourceFactory
(
userAgent
));
new
DefaultHttpDataSourceFactory
(
userAgent
));
DefaultDrmSessionManager
drmSessionManager
=
FrameworkMediaDrm
frameworkMediaDrm
=
FrameworkMediaDrm
.
newInstance
(
WIDEVINE_UUID
);
new
DefaultDrmSessionManager
.
Builder
()
DefaultDrmSessionManager
drmSessionManager
=
.
setUuidAndExoMediaDrmProvider
(
new
DefaultDrmSessionManager
(
C
.
WIDEVINE_UUID
,
C
.
WIDEVINE_UUID
,
uuid
->
{
frameworkMediaDrm
,
try
{
drmCallback
,
FrameworkMediaDrm
drm
=
FrameworkMediaDrm
.
newInstance
(
WIDEVINE_UUID
);
/* keyRequestParameters= */
null
,
if
(!
useL1Widevine
)
{
/* multiSession= */
false
,
drm
.
setPropertyString
(
SECURITY_LEVEL_PROPERTY
,
WIDEVINE_SECURITY_LEVEL_3
);
DefaultDrmSessionManager
.
INITIAL_DRM_REQUEST_RETRY_COUNT
);
}
if
(!
useL1Widevine
)
{
return
drm
;
frameworkMediaDrm
.
setPropertyString
(
SECURITY_LEVEL_PROPERTY
,
WIDEVINE_SECURITY_LEVEL_3
);
}
catch
(
UnsupportedDrmException
e
)
{
}
throw
new
IllegalStateException
(
e
);
if
(
offlineLicenseKeySetId
!=
null
)
{
}
drmSessionManager
.
setMode
(
DefaultDrmSessionManager
.
MODE_PLAYBACK
,
})
offlineLicenseKeySetId
);
.
build
(
drmCallback
);
}
return
drmSessionManager
;
if
(
offlineLicenseKeySetId
!=
null
)
{
}
catch
(
UnsupportedDrmException
e
)
{
drmSessionManager
.
setMode
(
DefaultDrmSessionManager
.
MODE_PLAYBACK
,
offlineLicenseKeySetId
);
throw
new
IllegalStateException
(
e
);
}
}
return
drmSessionManager
;
}
}
@Override
@Override
...
...
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