sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add overridingDrmInitData to DecryptableSampleQueueReader

Browse source 
To use in HLS when session keys are provided

PiperOrigin-RevId: 257421156
This commit is contained in:
aquilescanta 2019-07-10 17:38:03 +01:00 committed by Oliver Woodman
parent 49a2e5a5cb
commit d4e3e8f2e0
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/core/src/main/java/com/google/android/exoplayer2/source/DecryptableSampleQueueReader.java
View file

@ -27,6 +27,8 @@ import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** /**
@ -39,6 +41,7 @@ public final class DecryptableSampleQueueReader {
private final DrmSessionManager<?> sessionManager; private final DrmSessionManager<?> sessionManager;
private final FormatHolder formatHolder; private final FormatHolder formatHolder;
private final boolean playClearSamplesWithoutKeys; private final boolean playClearSamplesWithoutKeys;
private final HashMap<String, DrmInitData> overridingDrmInitDatas;
private @MonotonicNonNull Format currentFormat; private @MonotonicNonNull Format currentFormat;
@Nullable private DrmSession<?> currentSession; @Nullable private DrmSession<?> currentSession;
@ -55,6 +58,19 @@ public final class DecryptableSampleQueueReader {
formatHolder = new FormatHolder(); formatHolder = new FormatHolder();
playClearSamplesWithoutKeys = playClearSamplesWithoutKeys =
(sessionManager.getFlags() & DrmSessionManager.FLAG_PLAY_CLEAR_SAMPLES_WITHOUT_KEYS) != 0; (sessionManager.getFlags() & DrmSessionManager.FLAG_PLAY_CLEAR_SAMPLES_WITHOUT_KEYS) != 0;
overridingDrmInitDatas = new HashMap<>();
}
/**
* Given a mapping from {@link DrmInitData#schemeType} to {@link DrmInitData}, overrides any
* {@link DrmInitData} read from the upstream {@link SampleQueue} whose {@link
* DrmInitData#schemeType} is a key in the mapping to use the corresponding {@link DrmInitData}
* value. If {@code overridingDrmInitDatas} does not contain a mapping for the upstream {@link
* DrmInitData#schemeType}, the upstream {@link DrmInitData} is used.
*/
public void setOverridingDrmInitDatas(Map<String, DrmInitData> overridingDrmInitDatas) {
this.overridingDrmInitDatas.clear();
this.overridingDrmInitDatas.putAll(overridingDrmInitDatas);
} }
/** Releases any resources acquired by this reader. */ /** Releases any resources acquired by this reader. */
@ -170,6 +186,10 @@ public final class DecryptableSampleQueueReader {
DrmSession<?> previousSession = currentSession; DrmSession<?> previousSession = currentSession;
DrmInitData drmInitData = currentFormat.drmInitData; DrmInitData drmInitData = currentFormat.drmInitData;
if (drmInitData != null) { if (drmInitData != null) {
DrmInitData overridingDrmInitData = overridingDrmInitDatas.get(drmInitData.schemeType);
if (overridingDrmInitData != null) {
drmInitData = overridingDrmInitData;
}
currentSession = currentSession =
sessionManager.acquireSession(Assertions.checkNotNull(Looper.myLooper()), drmInitData); sessionManager.acquireSession(Assertions.checkNotNull(Looper.myLooper()), drmInitData);
} else { } else {