Commit f729b6d8 by tonihei Committed by Tianyi Feng

Remove dead code in ProgressiveMediaSource.Builder

These fields cannot be set and the logic to handle them can be removed.

PiperOrigin-RevId: 544646460
(cherry picked from commit d5ba034e1f7435c55f52126be53a09a7f3bc37a9)
parent bafdd53b
...@@ -66,8 +66,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -66,8 +66,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource
private DrmSessionManagerProvider drmSessionManagerProvider; private DrmSessionManagerProvider drmSessionManagerProvider;
private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
private int continueLoadingCheckIntervalBytes; private int continueLoadingCheckIntervalBytes;
@Nullable private String customCacheKey;
@Nullable private Object tag;
/** /**
* Creates a new factory for {@link ProgressiveMediaSource}s. * Creates a new factory for {@link ProgressiveMediaSource}s.
...@@ -211,16 +209,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -211,16 +209,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override @Override
public ProgressiveMediaSource createMediaSource(MediaItem mediaItem) { public ProgressiveMediaSource createMediaSource(MediaItem mediaItem) {
checkNotNull(mediaItem.localConfiguration); checkNotNull(mediaItem.localConfiguration);
boolean needsTag = mediaItem.localConfiguration.tag == null && tag != null;
boolean needsCustomCacheKey =
mediaItem.localConfiguration.customCacheKey == null && customCacheKey != null;
if (needsTag && needsCustomCacheKey) {
mediaItem = mediaItem.buildUpon().setTag(tag).setCustomCacheKey(customCacheKey).build();
} else if (needsTag) {
mediaItem = mediaItem.buildUpon().setTag(tag).build();
} else if (needsCustomCacheKey) {
mediaItem = mediaItem.buildUpon().setCustomCacheKey(customCacheKey).build();
}
return new ProgressiveMediaSource( return new ProgressiveMediaSource(
mediaItem, mediaItem,
dataSourceFactory, dataSourceFactory,
......
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