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

Add key set id to MediaItem

Browse Source 
PiperOrigin-RevId: 307390673
This commit is contained in:
bachinger 2020-04-20 14:58:58 +01:00 committed by Ian Baker
parent cb51a1bfe6
commit 8d0d31e15c
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
View File

@ -68,6 +68,7 @@ public final class MediaItem {
private boolean drmMultiSession;
private boolean drmPlayClearContentWithoutKey;
private List<Integer> drmSessionForClearTypes;
@Nullable private byte[] drmKeySetId;
private List<StreamKey> streamKeys;
@Nullable private String customCacheKey;
private List<Subtitle> subtitles;
@ -110,6 +111,7 @@ public final class MediaItem {
drmPlayClearContentWithoutKey = drmConfiguration.playClearContentWithoutKey;
drmSessionForClearTypes = drmConfiguration.sessionForClearTypes;
drmUuid = drmConfiguration.uuid;
drmKeySetId = drmConfiguration.getKeySetId();
}
}
}
@ -311,6 +313,20 @@ public final class MediaItem {
return this;
}
/**
* Sets the key set ID of the offline license.
*
* <p>The key set ID identifies an offline license. The ID is required to query, renew or
* release an existing offline license (see {@code DefaultDrmSessionManager#setMode(int
* mode,byte[] offlineLicenseKeySetId)}).
*
* <p>If no valid DRM configuration is specified, the key set ID is ignored.
*/
public Builder setDrmKeySetId(@Nullable byte[] keySetId) {
this.drmKeySetId = keySetId != null ? Arrays.copyOf(keySetId, keySetId.length) : null;
return this;
}
/**
* Sets the optional stream keys by which the manifest is filtered (only used for adaptive
* streams).
@ -414,7 +430,8 @@ public final class MediaItem {
drmLicenseRequestHeaders,
drmMultiSession,
drmPlayClearContentWithoutKey,
drmSessionForClearTypes)
drmSessionForClearTypes,
drmKeySetId)
: null,
streamKeys,
customCacheKey,
@ -463,19 +480,29 @@ public final class MediaItem {
/** The types of clear tracks for which to use a drm session. */
public final List<Integer> sessionForClearTypes;
@Nullable private final byte[] keySetId;
private DrmConfiguration(
UUID uuid,
@Nullable Uri licenseUri,
Map<String, String> requestHeaders,
boolean multiSession,
boolean playClearContentWithoutKey,
List<Integer> drmSessionForClearTypes) {
List<Integer> drmSessionForClearTypes,
@Nullable byte[] keySetId) {
this.uuid = uuid;
this.licenseUri = licenseUri;
this.requestHeaders = requestHeaders;
this.multiSession = multiSession;
this.playClearContentWithoutKey = playClearContentWithoutKey;
this.sessionForClearTypes = drmSessionForClearTypes;
this.keySetId = keySetId != null ? Arrays.copyOf(keySetId, keySetId.length) : null;
}
/** Returns the key set ID of the offline license. */
@Nullable
public byte[] getKeySetId() {
return keySetId != null ? Arrays.copyOf(keySetId, keySetId.length) : null;
}
@Override
@ -493,7 +520,8 @@ public final class MediaItem {
&& Util.areEqual(requestHeaders, other.requestHeaders)
&& multiSession == other.multiSession
&& playClearContentWithoutKey == other.playClearContentWithoutKey
&& sessionForClearTypes.equals(other.sessionForClearTypes);
&& sessionForClearTypes.equals(other.sessionForClearTypes)
&& Arrays.equals(keySetId, other.keySetId);
}
@Override
@ -504,6 +532,7 @@ public final class MediaItem {
result = 31 * result + (multiSession ? 1 : 0);
result = 31 * result + (playClearContentWithoutKey ? 1 : 0);
result = 31 * result + sessionForClearTypes.hashCode();
result = 31 * result + Arrays.hashCode(keySetId);
return result;
}
}

4
library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
View File

@ -91,6 +91,7 @@ public class MediaItemTest {
Uri licenseUri = Uri.parse(URI_STRING);
Map<String, String> requestHeaders = new HashMap<>();
requestHeaders.put("Referer", "http://www.google.com");
byte[] keySetId = new byte[] {1, 2, 3};
MediaItem mediaItem =
new MediaItem.Builder()
.setSourceUri(URI_STRING)
@ -100,6 +101,7 @@ public class MediaItemTest {
.setDrmMultiSession(/* multiSession= */ true)
.setDrmPlayClearContentWithoutKey(true)
.setDrmSessionForClearTypes(Collections.singletonList(C.TRACK_TYPE_AUDIO))
.setDrmKeySetId(keySetId)
.build();
assertThat(mediaItem.playbackProperties.drmConfiguration).isNotNull();
@ -111,6 +113,7 @@ public class MediaItemTest {
assertThat(mediaItem.playbackProperties.drmConfiguration.playClearContentWithoutKey).isTrue();
assertThat(mediaItem.playbackProperties.drmConfiguration.sessionForClearTypes)
.containsExactly(C.TRACK_TYPE_AUDIO);
assertThat(mediaItem.playbackProperties.drmConfiguration.getKeySetId()).isEqualTo(keySetId);
}
@Test
@ -304,6 +307,7 @@ public class MediaItemTest {
.setDrmMultiSession(true)
.setDrmPlayClearContentWithoutKey(true)
.setDrmSessionForClearTypes(Collections.singletonList(C.TRACK_TYPE_AUDIO))
.setDrmKeySetId(new byte[] {1, 2, 3})
.setMediaId("mediaId")
.setMediaMetadata(new MediaMetadata.Builder().setTitle("title").build())
.setMimeType(MimeTypes.APPLICATION_MP4)