loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 00:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate usages of DefaultDrmSessionManager constructor to Builder

Browse Source 
PiperOrigin-RevId: 321174738
This commit is contained in:
ibaker 2020-07-14 17:37:06 +01:00 committed by Oliver Woodman
parent 2f19b63ca0
commit 5c4b8085a0
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
* Default is false.
* @deprecated Use {@link Builder} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
public DefaultDrmSessionManager(
UUID uuid,

44
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View File

@ -262,29 +262,29 @@ import java.util.List;
if (widevineLicenseUrl == null) {
return DrmSessionManager.getDummyDrmSessionManager();
}
try {
MediaDrmCallback drmCallback = new HttpMediaDrmCallback(widevineLicenseUrl,
new DefaultHttpDataSourceFactory(userAgent));
FrameworkMediaDrm frameworkMediaDrm = FrameworkMediaDrm.newInstance(WIDEVINE_UUID);
DefaultDrmSessionManager drmSessionManager =
new DefaultDrmSessionManager(
C.WIDEVINE_UUID,
frameworkMediaDrm,
drmCallback,
/* keyRequestParameters= */ null,
/* multiSession= */ false,
DefaultDrmSessionManager.INITIAL_DRM_REQUEST_RETRY_COUNT);
if (!useL1Widevine) {
frameworkMediaDrm.setPropertyString(SECURITY_LEVEL_PROPERTY, WIDEVINE_SECURITY_LEVEL_3);
}
if (offlineLicenseKeySetId != null) {
drmSessionManager.setMode(DefaultDrmSessionManager.MODE_PLAYBACK,
offlineLicenseKeySetId);
}
return drmSessionManager;
} catch (UnsupportedDrmException e) {
throw new IllegalStateException(e);
MediaDrmCallback drmCallback =
new HttpMediaDrmCallback(widevineLicenseUrl, new DefaultHttpDataSourceFactory(userAgent));
DefaultDrmSessionManager drmSessionManager =
new DefaultDrmSessionManager.Builder()
.setUuidAndExoMediaDrmProvider(
C.WIDEVINE_UUID,
uuid -> {
try {
FrameworkMediaDrm drm = FrameworkMediaDrm.newInstance(WIDEVINE_UUID);
if (!useL1Widevine) {
drm.setPropertyString(SECURITY_LEVEL_PROPERTY, WIDEVINE_SECURITY_LEVEL_3);
}
return drm;
} catch (UnsupportedDrmException e) {
throw new IllegalStateException(e);
}
})
.build(drmCallback);
if (offlineLicenseKeySetId != null) {
drmSessionManager.setMode(DefaultDrmSessionManager.MODE_PLAYBACK, offlineLicenseKeySetId);
}
return drmSessionManager;
}
@Override