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

Remove deprecated method DrmInitData.get(UUID)

Browse source 
PiperOrigin-RevId: 351589689
This commit is contained in:
christosts 2021-01-13 16:14:09 +00:00 committed by Ian Baker
parent d5124e8cdc
commit 73114e3987
3 changed files with 3 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -8,6 +8,8 @@
`Player.EventListener.onTimelineChanged(Timeline, int)` instead. `Player.EventListener.onTimelineChanged(Timeline, int)` instead.
* `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder` * `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder`
instead. instead.
* `DrmInitData.get(UUID)`. Use `DrmInitData.get(int)` and
`DrmInitData.SchemeData.matches(UUID)` instead.
* `MappedTrackInfo.getTrackFormatSupport(int, int, int)`. Use * `MappedTrackInfo.getTrackFormatSupport(int, int, int)`. Use
`MappedTrackInfo.getTrackSupport(int, int, int)`. `MappedTrackInfo.getTrackSupport(int, int, int)`.
* `MappedTrackInfo.getTrackTypeRendererSupport(int)`. Use * `MappedTrackInfo.getTrackTypeRendererSupport(int)`. Use

18
library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
View file

@ -143,24 +143,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
schemeDataCount = schemeDatas.length; schemeDataCount = schemeDatas.length;
} }
/**
* Retrieves data for a given DRM scheme, specified by its UUID.
*
* @deprecated Use {@link #get(int)} and {@link SchemeData#matches(UUID)} instead.
* @param uuid The DRM scheme's UUID.
* @return The initialization data for the scheme, or null if the scheme is not supported.
*/
@Deprecated
@Nullable
public SchemeData get(UUID uuid) {
for (SchemeData schemeData : schemeDatas) {
if (schemeData.matches(uuid)) {
return schemeData;
}
}
return null;
}
/** /**
* Retrieves the {@link SchemeData} at a given index. * Retrieves the {@link SchemeData} at a given index.
* *

32
library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
View file

@ -93,34 +93,6 @@ public class DrmInitDataTest {
assertThat(testInitData).isNotEqualTo(drmInitData); assertThat(testInitData).isNotEqualTo(drmInitData);
} }
@Test
@SuppressWarnings("deprecation")
public void getByUuid() {
// Basic matching.
DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
assertThat(testInitData.get(UUID_NIL)).isNull();
// Basic matching including universal data.
testInitData = new DrmInitData(DATA_1, DATA_2, DATA_UNIVERSAL);
assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
// Passing the scheme data in reverse order shouldn't affect equality.
testInitData = new DrmInitData(DATA_UNIVERSAL, DATA_2, DATA_1);
assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
// Universal data should be returned in the absence of a specific match.
testInitData = new DrmInitData(DATA_1, DATA_UNIVERSAL);
assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_UNIVERSAL);
assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
}
@Test @Test
public void getByIndex() { public void getByIndex() {
DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2); DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
@ -128,12 +100,10 @@ public class DrmInitDataTest {
} }
@Test @Test
@SuppressWarnings("deprecation")
public void schemeDatasWithSameUuid() { public void schemeDatasWithSameUuid() {
DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1B); DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1B);
assertThat(testInitData.schemeDataCount).isEqualTo(2); assertThat(testInitData.schemeDataCount).isEqualTo(2);
// Deprecated get method should return first entry.
assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
// Test retrieval of first and second entry. // Test retrieval of first and second entry.
assertThat(testInitData.get(0)).isEqualTo(DATA_1); assertThat(testInitData.get(0)).isEqualTo(DATA_1);
assertThat(testInitData.get(1)).isEqualTo(DATA_1B); assertThat(testInitData.get(1)).isEqualTo(DATA_1B);