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

Allows setting LoadErrorHandlingPolicy for DRM

Browse Source 
The `DefaultDrmSessionManager` allows setting this policy.  This change
simply plumbs the setting up to the `DefaultDrmSessionManagerProvider`
This commit is contained in:
Steve Mayhew 2024-04-11 09:25:25 -07:00 committed by Ian Baker
parent 236c341168
commit 566c0b3eea
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManagerProvider.java
View File

@ -25,6 +25,7 @@ import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.datasource.DataSource; import androidx.media3.datasource.DataSource;
import androidx.media3.datasource.DefaultHttpDataSource; import androidx.media3.datasource.DefaultHttpDataSource;
import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import java.util.Map; import java.util.Map;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@ -43,6 +44,7 @@ public final class DefaultDrmSessionManagerProvider implements DrmSessionManager
@Nullable private DataSource.Factory drmHttpDataSourceFactory; @Nullable private DataSource.Factory drmHttpDataSourceFactory;
@Nullable private String userAgent; @Nullable private String userAgent;
private LoadErrorHandlingPolicy drmLoadErrorHandlingPolicy;
public DefaultDrmSessionManagerProvider() { public DefaultDrmSessionManagerProvider() {
lock = new Object(); lock = new Object();
@ -69,6 +71,16 @@ public final class DefaultDrmSessionManagerProvider implements DrmSessionManager
this.userAgent = userAgent; this.userAgent = userAgent;
} }
/**
* Set a load error handling policy to user for the {@link DefaultDrmSessionManager}'s created
* by this provider
*
* @param drmLoadErrorHandlingPolicy - LoadErrorHandlingPolicy for DRM session management
*/
public void setDrmLoadErrorHandlingPolicy(LoadErrorHandlingPolicy drmLoadErrorHandlingPolicy) {
this.drmLoadErrorHandlingPolicy = drmLoadErrorHandlingPolicy;
}
@Override @Override
public DrmSessionManager get(MediaItem mediaItem) { public DrmSessionManager get(MediaItem mediaItem) {
checkNotNull(mediaItem.localConfiguration); checkNotNull(mediaItem.localConfiguration);
@ -100,15 +112,18 @@ public final class DefaultDrmSessionManagerProvider implements DrmSessionManager
for (Map.Entry<String, String> entry : drmConfiguration.licenseRequestHeaders.entrySet()) { for (Map.Entry<String, String> entry : drmConfiguration.licenseRequestHeaders.entrySet()) {
httpDrmCallback.setKeyRequestProperty(entry.getKey(), entry.getValue()); httpDrmCallback.setKeyRequestProperty(entry.getKey(), entry.getValue());
} }
DefaultDrmSessionManager drmSessionManager = DefaultDrmSessionManager.Builder drmSessionManagerBuilder =
new DefaultDrmSessionManager.Builder() new DefaultDrmSessionManager.Builder()
.setUuidAndExoMediaDrmProvider( .setUuidAndExoMediaDrmProvider(
drmConfiguration.scheme, FrameworkMediaDrm.DEFAULT_PROVIDER) drmConfiguration.scheme, FrameworkMediaDrm.DEFAULT_PROVIDER)
.setMultiSession(drmConfiguration.multiSession) .setMultiSession(drmConfiguration.multiSession)
.setPlayClearSamplesWithoutKeys(drmConfiguration.playClearContentWithoutKey) .setPlayClearSamplesWithoutKeys(drmConfiguration.playClearContentWithoutKey)
.setUseDrmSessionsForClearContent( .setUseDrmSessionsForClearContent(
Ints.toArray(drmConfiguration.forcedSessionTrackTypes)) Ints.toArray(drmConfiguration.forcedSessionTrackTypes));
.build(httpDrmCallback); if (drmLoadErrorHandlingPolicy != null) {
drmSessionManagerBuilder.setLoadErrorHandlingPolicy(drmLoadErrorHandlingPolicy);
}
DefaultDrmSessionManager drmSessionManager = drmSessionManagerBuilder.build(httpDrmCallback);
drmSessionManager.setMode(MODE_PLAYBACK, drmConfiguration.getKeySetId()); drmSessionManager.setMode(MODE_PLAYBACK, drmConfiguration.getKeySetId());
return drmSessionManager; return drmSessionManager;
} }