Skip to content

SDK / exoplayer

Go to a project
Commit 8db6ea46 by ibaker Committed by bachinger
Options

Rename MediaItem.ClippingProperties to ClippingConfiguration 

This is more consistent with the other MediaItem inner classes which are
all Configurations.

The old class and fields are left deprecated for backwards
compatibility.

MediaItem.Builder#setClippingProperties is directly renamed (without
deprecation) because it only exists on the dev-v2 branch and hasn't
been included in a numbered ExoPlayer release.

PiperOrigin-RevId: 399471414
parent b6b39cf7
Expand all
Inline Side-by-side
Showing with 35 additions and 33 deletions
library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
...@@ -307,12 +307,13 @@ public class MediaItemTest { ...@@ -307,12 +307,13 @@ public class MediaItemTest {
} }
@Test @Test
public void builderSetClippingProperties() { @SuppressWarnings("deprecation") // Testing deprecated field
public void builderSetClippingConfiguration() {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder() new MediaItem.Builder()
.setUri(URI_STRING) .setUri(URI_STRING)
.setClippingProperties( .setClippingConfiguration(
new MediaItem.ClippingProperties.Builder() new MediaItem.ClippingConfiguration.Builder()
.setStartPositionMs(1000L) .setStartPositionMs(1000L)
.setEndPositionMs(2000L) .setEndPositionMs(2000L)
.setRelativeToLiveWindow(true) .setRelativeToLiveWindow(true)
...@@ -321,40 +322,41 @@ public class MediaItemTest { ...@@ -321,40 +322,41 @@ public class MediaItemTest {
.build()) .build())
.build(); .build();
assertThat(mediaItem.clippingProperties.startPositionMs).isEqualTo(1000L); assertThat(mediaItem.clippingConfiguration.startPositionMs).isEqualTo(1000L);
assertThat(mediaItem.clippingProperties.endPositionMs).isEqualTo(2000L); assertThat(mediaItem.clippingConfiguration.endPositionMs).isEqualTo(2000L);
assertThat(mediaItem.clippingProperties.relativeToLiveWindow).isTrue(); assertThat(mediaItem.clippingConfiguration.relativeToLiveWindow).isTrue();
assertThat(mediaItem.clippingProperties.relativeToDefaultPosition).isTrue(); assertThat(mediaItem.clippingConfiguration.relativeToDefaultPosition).isTrue();
assertThat(mediaItem.clippingProperties.startsAtKeyFrame).isTrue(); assertThat(mediaItem.clippingConfiguration.startsAtKeyFrame).isTrue();
assertThat(mediaItem.clippingConfiguration).isEqualTo(mediaItem.clippingProperties);
} }
@Test @Test
public void clippingPropertiesDefaults() { public void clippingConfigurationDefaults() {
MediaItem.ClippingProperties clippingProperties = MediaItem.ClippingConfiguration clippingConfiguration =
new MediaItem.ClippingProperties.Builder().build(); new MediaItem.ClippingConfiguration.Builder().build();
assertThat(clippingProperties.startPositionMs).isEqualTo(0L); assertThat(clippingConfiguration.startPositionMs).isEqualTo(0L);
assertThat(clippingProperties.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE); assertThat(clippingConfiguration.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE);
assertThat(clippingProperties.relativeToLiveWindow).isFalse(); assertThat(clippingConfiguration.relativeToLiveWindow).isFalse();
assertThat(clippingProperties.relativeToDefaultPosition).isFalse(); assertThat(clippingConfiguration.relativeToDefaultPosition).isFalse();
assertThat(clippingProperties.startsAtKeyFrame).isFalse(); assertThat(clippingConfiguration.startsAtKeyFrame).isFalse();
assertThat(clippingProperties).isEqualTo(MediaItem.ClippingProperties.UNSET); assertThat(clippingConfiguration).isEqualTo(MediaItem.ClippingConfiguration.UNSET);
} }
@Test @Test
public void clippingPropertiesBuilder_throwsOnInvalidValues() { public void clippingConfigurationBuilder_throwsOnInvalidValues() {
MediaItem.ClippingProperties.Builder clippingPropertiesBuilder = MediaItem.ClippingConfiguration.Builder clippingConfigurationBuilder =
new MediaItem.ClippingProperties.Builder(); new MediaItem.ClippingConfiguration.Builder();
assertThrows( assertThrows(
IllegalArgumentException.class, () -> clippingPropertiesBuilder.setStartPositionMs(-1)); IllegalArgumentException.class, () -> clippingConfigurationBuilder.setStartPositionMs(-1));
assertThrows( assertThrows(
IllegalArgumentException.class, () -> clippingPropertiesBuilder.setEndPositionMs(-1)); IllegalArgumentException.class, () -> clippingConfigurationBuilder.setEndPositionMs(-1));
MediaItem.ClippingProperties clippingProperties = clippingPropertiesBuilder.build(); MediaItem.ClippingConfiguration clippingConfiguration = clippingConfigurationBuilder.build();
// Check neither of the setters succeeded in mutating the builder. // Check neither of the setters succeeded in mutating the builder.
assertThat(clippingProperties.startPositionMs).isEqualTo(0L); assertThat(clippingConfiguration.startPositionMs).isEqualTo(0L);
assertThat(clippingProperties.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE); assertThat(clippingConfiguration.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE);
} }
@Test @Test
...@@ -363,7 +365,7 @@ public class MediaItemTest { ...@@ -363,7 +365,7 @@ public class MediaItemTest {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_STRING).setClipStartPositionMs(1000L).build(); new MediaItem.Builder().setUri(URI_STRING).setClipStartPositionMs(1000L).build();
assertThat(mediaItem.clippingProperties.startPositionMs).isEqualTo(1000L); assertThat(mediaItem.clippingConfiguration.startPositionMs).isEqualTo(1000L);
} }
@Test @Test
...@@ -380,7 +382,7 @@ public class MediaItemTest { ...@@ -380,7 +382,7 @@ public class MediaItemTest {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_STRING).setClipEndPositionMs(1000L).build(); new MediaItem.Builder().setUri(URI_STRING).setClipEndPositionMs(1000L).build();
assertThat(mediaItem.clippingProperties.endPositionMs).isEqualTo(1000L); assertThat(mediaItem.clippingConfiguration.endPositionMs).isEqualTo(1000L);
} }
@Test @Test
...@@ -393,7 +395,7 @@ public class MediaItemTest { ...@@ -393,7 +395,7 @@ public class MediaItemTest {
.setClipEndPositionMs(C.TIME_END_OF_SOURCE) .setClipEndPositionMs(C.TIME_END_OF_SOURCE)
.build(); .build();
assertThat(mediaItem.clippingProperties.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE); assertThat(mediaItem.clippingConfiguration.endPositionMs).isEqualTo(C.TIME_END_OF_SOURCE);
} }
@Test @Test
...@@ -415,9 +417,9 @@ public class MediaItemTest { ...@@ -415,9 +417,9 @@ public class MediaItemTest {
.setClipStartsAtKeyFrame(true) .setClipStartsAtKeyFrame(true)
.build(); .build();
assertThat(mediaItem.clippingProperties.relativeToDefaultPosition).isTrue(); assertThat(mediaItem.clippingConfiguration.relativeToDefaultPosition).isTrue();
assertThat(mediaItem.clippingProperties.relativeToLiveWindow).isTrue(); assertThat(mediaItem.clippingConfiguration.relativeToLiveWindow).isTrue();
assertThat(mediaItem.clippingProperties.startsAtKeyFrame).isTrue(); assertThat(mediaItem.clippingConfiguration.startsAtKeyFrame).isTrue();
} }
@Test @Test
...@@ -605,8 +607,8 @@ public class MediaItemTest { ...@@ -605,8 +607,8 @@ public class MediaItemTest {
new MediaItem.Builder() new MediaItem.Builder()
.setAdsConfiguration( .setAdsConfiguration(
new MediaItem.AdsConfiguration.Builder(Uri.parse(URI_STRING)).build()) new MediaItem.AdsConfiguration.Builder(Uri.parse(URI_STRING)).build())
.setClippingProperties( .setClippingConfiguration(
new MediaItem.ClippingProperties.Builder() new MediaItem.ClippingConfiguration.Builder()
.setEndPositionMs(1000) .setEndPositionMs(1000)
.setRelativeToDefaultPosition(true) .setRelativeToDefaultPosition(true)
.setRelativeToLiveWindow(true) .setRelativeToLiveWindow(true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment