diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java index 634e036de9..467dd58c35 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java @@ -531,7 +531,7 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou @Override protected void onChildSourceInfoRefreshed( - Void id, MediaSource mediaSource, Timeline newTimeline) { + Void childSourceId, MediaSource mediaSource, Timeline newTimeline) { refreshSourceInfo( new ForwardingTimeline(newTimeline) { @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java index 58b8b22846..c1dfa1ac98 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java @@ -226,11 +226,11 @@ public final class ClippingMediaSource extends WrappingMediaSource { } @Override - protected void onChildSourceInfoRefreshed(Timeline timeline) { + protected void onChildSourceInfoRefreshed(Timeline newTimeline) { if (clippingError != null) { return; } - refreshClippedTimeline(timeline); + refreshClippedTimeline(newTimeline); } private void refreshClippedTimeline(Timeline timeline) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java index b38a0832d4..08912c0586 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java @@ -90,12 +90,12 @@ public abstract class CompositeMediaSource extends BaseMediaSource { /** * Called when the source info of a child source has been refreshed. * - * @param id The unique id used to prepare the child source. + * @param childSourceId The unique id used to prepare the child source. * @param mediaSource The child source whose source info has been refreshed. - * @param timeline The timeline of the child source. + * @param newTimeline The timeline of the child source. */ protected abstract void onChildSourceInfoRefreshed( - @UnknownNull T id, MediaSource mediaSource, Timeline timeline); + @UnknownNull T childSourceId, MediaSource mediaSource, Timeline newTimeline); /** * Prepares a child source. @@ -159,11 +159,11 @@ public abstract class CompositeMediaSource extends BaseMediaSource { * Returns the window index in the composite source corresponding to the specified window index in * a child source. The default implementation does not change the window index. * - * @param id The unique id used to prepare the child source. + * @param childSourceId The unique id used to prepare the child source. * @param windowIndex A window index of the child source. * @return The corresponding window index in the composite source. */ - protected int getWindowIndexForChildWindowIndex(@UnknownNull T id, int windowIndex) { + protected int getWindowIndexForChildWindowIndex(@UnknownNull T childSourceId, int windowIndex) { return windowIndex; } @@ -172,14 +172,14 @@ public abstract class CompositeMediaSource extends BaseMediaSource { * MediaPeriodId} in a child source. The default implementation does not change the media period * id. * - * @param id The unique id used to prepare the child source. + * @param childSourceId The unique id used to prepare the child source. * @param mediaPeriodId A {@link MediaPeriodId} of the child source. * @return The corresponding {@link MediaPeriodId} in the composite source. Null if no * corresponding media period id can be determined. */ @Nullable protected MediaPeriodId getMediaPeriodIdForChildMediaPeriodId( - @UnknownNull T id, MediaPeriodId mediaPeriodId) { + @UnknownNull T childSourceId, MediaPeriodId mediaPeriodId) { return mediaPeriodId; } @@ -188,13 +188,13 @@ public abstract class CompositeMediaSource extends BaseMediaSource { * specified media time in the {@link MediaPeriod} of the child source. The default implementation * does not change the media time. * - * @param id The unique id used to prepare the child source. + * @param childSourceId The unique id used to prepare the child source. * @param mediaTimeMs A media time in the {@link MediaPeriod} of the child source, in * milliseconds. * @return The corresponding media time in the {@link MediaPeriod} of the composite source, in * milliseconds. */ - protected long getMediaTimeForChildMediaTime(@UnknownNull T id, long mediaTimeMs) { + protected long getMediaTimeForChildMediaTime(@UnknownNull T childSourceId, long mediaTimeMs) { return mediaTimeMs; } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java index bb9098be4d..aa26f34df6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java @@ -526,12 +526,22 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource { @Override protected void onChildSourceInfoRefreshed( - Integer id, MediaSource mediaSource, Timeline timeline) { + Integer childSourceId, MediaSource mediaSource, Timeline newTimeline) { if (mergeError != null) { return; } if (periodCount == PERIOD_COUNT_UNSET) { - periodCount = timeline.getPeriodCount(); - } else if (timeline.getPeriodCount() != periodCount) { + periodCount = newTimeline.getPeriodCount(); + } else if (newTimeline.getPeriodCount() != periodCount) { mergeError = new IllegalMergeException(IllegalMergeException.REASON_PERIOD_COUNT_MISMATCH); return; } @@ -250,7 +250,7 @@ public final class MergingMediaSource extends CompositeMediaSource { periodTimeOffsetsUs = new long[periodCount][timelines.length]; } pendingTimelineSources.remove(mediaSource); - timelines[id] = timeline; + timelines[childSourceId] = newTimeline; if (pendingTimelineSources.isEmpty()) { if (adjustPeriodTimeOffsets) { computePeriodTimeOffsets(); @@ -267,8 +267,8 @@ public final class MergingMediaSource extends CompositeMediaSource { @Override @Nullable protected MediaPeriodId getMediaPeriodIdForChildMediaPeriodId( - Integer id, MediaPeriodId mediaPeriodId) { - return id == 0 ? mediaPeriodId : null; + Integer childSourceId, MediaPeriodId mediaPeriodId) { + return childSourceId == 0 ? mediaPeriodId : null; } private void computePeriodTimeOffsets() { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/WrappingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/WrappingMediaSource.java index cf2a421198..fe29c5a17f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/WrappingMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/WrappingMediaSource.java @@ -126,8 +126,8 @@ public abstract class WrappingMediaSource extends CompositeMediaSource { @Override protected final void onChildSourceInfoRefreshed( - Void id, MediaSource mediaSource, Timeline timeline) { - onChildSourceInfoRefreshed(timeline); + Void childSourceId, MediaSource mediaSource, Timeline newTimeline) { + onChildSourceInfoRefreshed(newTimeline); } /** @@ -137,14 +137,14 @@ public abstract class WrappingMediaSource extends CompositeMediaSource { * ForwardingTimeline}. The {@link Timeline} for the wrapping source needs to be published with * {@link #refreshSourceInfo(Timeline)}. * - * @param timeline The timeline of the child source. + * @param newTimeline The timeline of the child source. */ - protected void onChildSourceInfoRefreshed(Timeline timeline) { - refreshSourceInfo(timeline); + protected void onChildSourceInfoRefreshed(Timeline newTimeline) { + refreshSourceInfo(newTimeline); } @Override - protected final int getWindowIndexForChildWindowIndex(Void id, int windowIndex) { + protected final int getWindowIndexForChildWindowIndex(Void childSourceId, int windowIndex) { return getWindowIndexForChildWindowIndex(windowIndex); } @@ -162,7 +162,7 @@ public abstract class WrappingMediaSource extends CompositeMediaSource { @Nullable @Override protected final MediaPeriodId getMediaPeriodIdForChildMediaPeriodId( - Void id, MediaPeriodId mediaPeriodId) { + Void childSourceId, MediaPeriodId mediaPeriodId) { return getMediaPeriodIdForChildMediaPeriodId(mediaPeriodId); } @@ -181,7 +181,7 @@ public abstract class WrappingMediaSource extends CompositeMediaSource { } @Override - protected final long getMediaTimeForChildMediaTime(Void id, long mediaTimeMs) { + protected final long getMediaTimeForChildMediaTime(Void childSourceId, long mediaTimeMs) { return getMediaTimeForChildMediaTime(mediaTimeMs); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java index ae35402b54..5c15f6b3f8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java @@ -256,25 +256,25 @@ public final class AdsMediaSource extends CompositeMediaSource { @Override protected void onChildSourceInfoRefreshed( - MediaPeriodId mediaPeriodId, MediaSource mediaSource, Timeline timeline) { - if (mediaPeriodId.isAd()) { - int adGroupIndex = mediaPeriodId.adGroupIndex; - int adIndexInAdGroup = mediaPeriodId.adIndexInAdGroup; + MediaPeriodId childSourceId, MediaSource mediaSource, Timeline newTimeline) { + if (childSourceId.isAd()) { + int adGroupIndex = childSourceId.adGroupIndex; + int adIndexInAdGroup = childSourceId.adIndexInAdGroup; checkNotNull(adMediaSourceHolders[adGroupIndex][adIndexInAdGroup]) - .handleSourceInfoRefresh(timeline); + .handleSourceInfoRefresh(newTimeline); } else { - Assertions.checkArgument(timeline.getPeriodCount() == 1); - contentTimeline = timeline; + Assertions.checkArgument(newTimeline.getPeriodCount() == 1); + contentTimeline = newTimeline; } maybeUpdateSourceInfo(); } @Override protected MediaPeriodId getMediaPeriodIdForChildMediaPeriodId( - MediaPeriodId childId, MediaPeriodId mediaPeriodId) { + MediaPeriodId childSourceId, MediaPeriodId mediaPeriodId) { // The child id for the content period is just CHILD_SOURCE_MEDIA_PERIOD_ID. That's why // we need to forward the reported mediaPeriodId in this case. - return childId.isAd() ? childId : mediaPeriodId; + return childSourceId.isAd() ? childSourceId : mediaPeriodId; } // Internal methods. diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java index 99488539f2..a22efa428a 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java @@ -110,15 +110,15 @@ public final class HlsDownloader extends SegmentDownloader { } @Override - protected List getSegments(DataSource dataSource, HlsPlaylist playlist, boolean removing) + protected List getSegments(DataSource dataSource, HlsPlaylist manifest, boolean removing) throws IOException, InterruptedException { ArrayList mediaPlaylistDataSpecs = new ArrayList<>(); - if (playlist instanceof HlsMultivariantPlaylist) { - HlsMultivariantPlaylist multivariantPlaylist = (HlsMultivariantPlaylist) playlist; + if (manifest instanceof HlsMultivariantPlaylist) { + HlsMultivariantPlaylist multivariantPlaylist = (HlsMultivariantPlaylist) manifest; addMediaPlaylistDataSpecs(multivariantPlaylist.mediaPlaylistUrls, mediaPlaylistDataSpecs); } else { mediaPlaylistDataSpecs.add( - SegmentDownloader.getCompressibleDataSpec(Uri.parse(playlist.baseUri))); + SegmentDownloader.getCompressibleDataSpec(Uri.parse(manifest.baseUri))); } ArrayList segments = new ArrayList<>(); diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java index dcb99b5074..695cbad321 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java @@ -115,7 +115,7 @@ public final class SsDownloader extends SegmentDownloader { @Override protected List getSegments( - DataSource dataSource, SsManifest manifest, boolean allowIncompleteList) { + DataSource dataSource, SsManifest manifest, boolean removing) { ArrayList segments = new ArrayList<>(); for (StreamElement streamElement : manifest.streamElements) { for (int i = 0; i < streamElement.formats.length; i++) {