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

Minor DRM documentation tweaks

Browse source 
PiperOrigin-RevId: 277729887
This commit is contained in:
olly 2019-10-31 15:49:27 +00:00 committed by Oliver Woodman
parent f554dc4ea4
commit f55083ab48
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View file

@ -71,10 +71,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
* <li>{@link #setUuidAndExoMediaDrmProvider UUID}: {@link C#WIDEVINE_UUID}. * <li>{@link #setUuidAndExoMediaDrmProvider UUID}: {@link C#WIDEVINE_UUID}.
* <li>{@link #setUuidAndExoMediaDrmProvider ExoMediaDrm.Provider}: {@link * <li>{@link #setUuidAndExoMediaDrmProvider ExoMediaDrm.Provider}: {@link
* FrameworkMediaDrm#DEFAULT_PROVIDER}. * FrameworkMediaDrm#DEFAULT_PROVIDER}.
* <li>{@link #setMultiSession multiSession}: Not allowed by default. * <li>{@link #setMultiSession multiSession}: {@code false}.
* <li>{@link #setPreferSecureDecoders preferSecureDecoders}: Not allowed by default. * <li>{@link #setPreferSecureDecoders preferSecureDecoders}: {@code false}.
* <li>{@link #setPlayClearSamplesWithoutKeys playClearSamplesWithoutKeys}: Not allowed by * <li>{@link #setPlayClearSamplesWithoutKeys playClearSamplesWithoutKeys}: {@code false}.
* default.
* <li>{@link #setLoadErrorHandlingPolicy LoadErrorHandlingPolicy}: {@link * <li>{@link #setLoadErrorHandlingPolicy LoadErrorHandlingPolicy}: {@link
* DefaultLoadErrorHandlingPolicy}. * DefaultLoadErrorHandlingPolicy}.
* </ul> * </ul>
@ -84,9 +83,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
keyRequestParameters = new HashMap<>(); keyRequestParameters = new HashMap<>();
uuid = C.WIDEVINE_UUID; uuid = C.WIDEVINE_UUID;
exoMediaDrmProvider = (ExoMediaDrm.Provider) FrameworkMediaDrm.DEFAULT_PROVIDER; exoMediaDrmProvider = (ExoMediaDrm.Provider) FrameworkMediaDrm.DEFAULT_PROVIDER;
multiSession = false;
preferSecureDecoders = false;
flags = 0;
loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy(); loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy();
} }
@ -145,13 +141,11 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
} }
/** /**
* Sets whether clear samples should be played when keys are not available. Keys are considered * Sets whether clear samples within protected content should be played when keys for the
* unavailable when the load request is taking place, or when the key request has failed. * encrypted part of the content have yet to be loaded.
* *
* <p>This option does not affect placeholder sessions. * @param playClearSamplesWithoutKeys Whether clear samples within protected content should be
* * played when keys for the encrypted part of the content have yet to be loaded.
* @param playClearSamplesWithoutKeys Whether clear samples should be played when keys are not
* available.
* @return This builder. * @return This builder.
*/ */
public Builder setPlayClearSamplesWithoutKeys(boolean playClearSamplesWithoutKeys) { public Builder setPlayClearSamplesWithoutKeys(boolean playClearSamplesWithoutKeys) {
@ -489,7 +483,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
assertExpectedPlaybackLooper(playbackLooper); assertExpectedPlaybackLooper(playbackLooper);
maybeCreateMediaDrmHandler(playbackLooper); maybeCreateMediaDrmHandler(playbackLooper);
List<SchemeData> schemeDatas = null; @Nullable List<SchemeData> schemeDatas = null;
if (offlineLicenseKeySetId == null) { if (offlineLicenseKeySetId == null) {
schemeDatas = getSchemeDatas(drmInitData, uuid, false); schemeDatas = getSchemeDatas(drmInitData, uuid, false);
if (schemeDatas.isEmpty()) { if (schemeDatas.isEmpty()) {

2
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
View file

@ -78,7 +78,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
/** /**
* Creates an instance with an {@link #acquire() acquired reference} for the specified scheme * Creates an instance with an {@link #acquire() acquired reference} for the specified scheme
* UUID. * UUID. {@link #release()} must be called when the instance is no longer required.
* *
* @param uuid The scheme uuid. * @param uuid The scheme uuid.
* @return The created instance. * @return The created instance.