loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated DefaultDrmSessionManager constructors

Browse Source 
Use `DefaultDrmSessionManager.Builder` instead.

#minor-release

PiperOrigin-RevId: 532102375
(cherry picked from commit 8a5cebb54dd17e40f0d10700645659450dd7d934)
This commit is contained in:
ibaker 2023-05-15 15:21:03 +01:00 committed by Tofunmi Adigun-Hameed
parent a1fbb12ade
commit 7ac9cf0ec7
2 changed files with 2 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -16,6 +16,8 @@
performance. performance.
* Remove `DefaultBandwidthMeter` constructor, use * Remove `DefaultBandwidthMeter` constructor, use
`DefaultBandwidthMeter.Builder` instead. `DefaultBandwidthMeter.Builder` instead.
* Remove `DefaultDrmSessionManager` constructors, use
`DefaultDrmSessionManager.Builder` instead.
### 1.1.0-alpha01 (2023-05-10) ### 1.1.0-alpha01 (2023-05-10)

83
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java
View File

@ -322,89 +322,6 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
/* package */ @Nullable volatile MediaDrmHandler mediaDrmHandler; /* package */ @Nullable volatile MediaDrmHandler mediaDrmHandler;
/**
* @param uuid The UUID of the drm scheme.
* @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests.
* @param keyRequestParameters An optional map of parameters to pass as the last argument to
* {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
* @deprecated Use {@link Builder} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm exoMediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> keyRequestParameters) {
this(
uuid,
exoMediaDrm,
callback,
keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
/* multiSession= */ false,
INITIAL_DRM_REQUEST_RETRY_COUNT);
}
/**
* @param uuid The UUID of the drm scheme.
* @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests.
* @param keyRequestParameters An optional map of parameters to pass as the last argument to
* {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
* @param multiSession A boolean that specify whether multiple key session support is enabled.
* Default is false.
* @deprecated Use {@link Builder} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm exoMediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> keyRequestParameters,
boolean multiSession) {
this(
uuid,
exoMediaDrm,
callback,
keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
multiSession,
INITIAL_DRM_REQUEST_RETRY_COUNT);
}
/**
* @param uuid The UUID of the drm scheme.
* @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests.
* @param keyRequestParameters An optional map of parameters to pass as the last argument to
* {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
* @param multiSession A boolean that specify whether multiple key session support is enabled.
* Default is false.
* @param initialDrmRequestRetryCount The number of times to retry for initial provisioning and
* key request before reporting error.
* @deprecated Use {@link Builder} instead.
*/
@Deprecated
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm exoMediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> keyRequestParameters,
boolean multiSession,
int initialDrmRequestRetryCount) {
this(
uuid,
new ExoMediaDrm.AppManagedProvider(exoMediaDrm),
callback,
keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
multiSession,
/* useDrmSessionsForClearContentTrackTypes= */ new int[0],
/* playClearSamplesWithoutKeys= */ false,
new DefaultLoadErrorHandlingPolicy(initialDrmRequestRetryCount),
DEFAULT_SESSION_KEEPALIVE_MS);
}
private DefaultDrmSessionManager( private DefaultDrmSessionManager(
UUID uuid, UUID uuid,
ExoMediaDrm.Provider exoMediaDrmProvider, ExoMediaDrm.Provider exoMediaDrmProvider,