Skip to content

SDK / exoplayer

Go to a project
Commit 7a3dedce by ibaker Committed by Oliver Woodman
Options

Rename MediaItem.Subtitle to SubtitleConfiguration 

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.

The deprecated Subtitle constructors are not moved to
SubtitleConfiguration.

PiperOrigin-RevId: 400144640
parent 4e9e38f3
Expand all
Inline Side-by-side
Showing with 101 additions and 57 deletions
library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
...@@ -258,11 +258,11 @@ public class MediaItemTest { ...@@ -258,11 +258,11 @@ public class MediaItemTest {
} }
@Test @Test
@SuppressWarnings("deprecation") // Using deprecated constructors @SuppressWarnings("deprecation") // Using deprecated Subtitle type
public void builderSetSubtitles_setsSubtitles() { public void builderSetSubtitles_setsSubtitles() {
List<MediaItem.Subtitle> subtitles = List<MediaItem.SubtitleConfiguration> subtitleConfigurations =
ImmutableList.of( ImmutableList.of(
new MediaItem.Subtitle.Builder(Uri.parse(URI_STRING + "/es")) new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/es"))
.setMimeType(MimeTypes.TEXT_SSA) .setMimeType(MimeTypes.TEXT_SSA)
.setLanguage(/* language= */ "es") .setLanguage(/* language= */ "es")
.setSelectionFlags(C.SELECTION_FLAG_FORCED) .setSelectionFlags(C.SELECTION_FLAG_FORCED)
...@@ -285,9 +285,14 @@ public class MediaItemTest { ...@@ -285,9 +285,14 @@ public class MediaItemTest {
"label")); "label"));
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_STRING).setSubtitles(subtitles).build(); new MediaItem.Builder()
.setUri(URI_STRING)
.setSubtitleConfigurations(subtitleConfigurations)
.build();
assertThat(mediaItem.localConfiguration.subtitles).isEqualTo(subtitles); assertThat(mediaItem.localConfiguration.subtitleConfigurations)
.isEqualTo(subtitleConfigurations);
assertThat(mediaItem.localConfiguration.subtitles).isEqualTo(subtitleConfigurations);
} }
@Test @Test
...@@ -583,9 +588,9 @@ public class MediaItemTest { ...@@ -583,9 +588,9 @@ public class MediaItemTest {
.setLiveMaxPlaybackSpeed(1.1f) .setLiveMaxPlaybackSpeed(1.1f)
.setLiveMinOffsetMs(2222) .setLiveMinOffsetMs(2222)
.setLiveMaxOffsetMs(4444) .setLiveMaxOffsetMs(4444)
.setSubtitles( .setSubtitleConfigurations(
ImmutableList.of( ImmutableList.of(
new MediaItem.Subtitle.Builder(Uri.parse(URI_STRING + "/en")) new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/en"))
.setMimeType(MimeTypes.APPLICATION_TTML) .setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage("en") .setLanguage("en")
.setSelectionFlags(C.SELECTION_FLAG_FORCED) .setSelectionFlags(C.SELECTION_FLAG_FORCED)
...@@ -639,9 +644,9 @@ public class MediaItemTest { ...@@ -639,9 +644,9 @@ public class MediaItemTest {
.setMinOffsetMs(2222) .setMinOffsetMs(2222)
.setMaxOffsetMs(4444) .setMaxOffsetMs(4444)
.build()) .build())
.setSubtitles( .setSubtitleConfigurations(
ImmutableList.of( ImmutableList.of(
new MediaItem.Subtitle.Builder(Uri.parse(URI_STRING + "/en")) new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/en"))
.setMimeType(MimeTypes.APPLICATION_TTML) .setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage("en") .setLanguage("en")
.setSelectionFlags(C.SELECTION_FLAG_FORCED) .setSelectionFlags(C.SELECTION_FLAG_FORCED)
......
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