mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Deprecate SingleSampleMediaSource.Factory#setTrackId
This method is no longer needed since we added SubtitleConfiguration#id
in 59d98b9a4e
.
Issue: google/ExoPlayer#10016
#minor-release
PiperOrigin-RevId: 432169262
This commit is contained in:
parent
2d3eea1e24
commit
232f2d815d
@ -74,11 +74,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets an optional track id to be used.
|
||||
*
|
||||
* @param trackId An optional track id.
|
||||
* @return This factory, for convenience.
|
||||
* @deprecated Use {@link MediaItem.SubtitleConfiguration.Builder#setId(String)} instead (on the
|
||||
* {@link MediaItem.SubtitleConfiguration} passed to {@link
|
||||
* #createMediaSource(MediaItem.SubtitleConfiguration, long)}). {@code trackId} will only be
|
||||
* used if {@link MediaItem.SubtitleConfiguration#id} is {@code null}.
|
||||
*/
|
||||
@Deprecated
|
||||
public Factory setTrackId(@Nullable String trackId) {
|
||||
this.trackId = trackId;
|
||||
return this;
|
||||
@ -157,29 +158,28 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
|
||||
this.durationUs = durationUs;
|
||||
this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
|
||||
this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
|
||||
mediaItem =
|
||||
this.mediaItem =
|
||||
new MediaItem.Builder()
|
||||
.setUri(Uri.EMPTY)
|
||||
.setMediaId(subtitleConfiguration.uri.toString())
|
||||
.setSubtitleConfigurations(ImmutableList.of(subtitleConfiguration))
|
||||
.setTag(tag)
|
||||
.build();
|
||||
format =
|
||||
this.format =
|
||||
new Format.Builder()
|
||||
.setId(trackId)
|
||||
.setSampleMimeType(firstNonNull(subtitleConfiguration.mimeType, MimeTypes.TEXT_UNKNOWN))
|
||||
.setLanguage(subtitleConfiguration.language)
|
||||
.setSelectionFlags(subtitleConfiguration.selectionFlags)
|
||||
.setRoleFlags(subtitleConfiguration.roleFlags)
|
||||
.setLabel(subtitleConfiguration.label)
|
||||
.setId(subtitleConfiguration.id)
|
||||
.setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
|
||||
.build();
|
||||
dataSpec =
|
||||
this.dataSpec =
|
||||
new DataSpec.Builder()
|
||||
.setUri(subtitleConfiguration.uri)
|
||||
.setFlags(DataSpec.FLAG_ALLOW_GZIP)
|
||||
.build();
|
||||
timeline =
|
||||
this.timeline =
|
||||
new SinglePeriodTimeline(
|
||||
durationUs,
|
||||
/* isSeekable= */ true,
|
||||
|
Loading…
x
Reference in New Issue
Block a user