loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(playlist): stick to list.subList API

Browse Source
This commit is contained in:
GiuseppePiscopo 2018-07-25 18:30:35 +02:00
parent 2c801ca267
commit cc7f011ecb
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
View File

@ -312,16 +312,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
* is thrown. * is thrown.
* *
* @param fromIndex The initial range index, pointing to the first media source that will be * @param fromIndex The initial range index, pointing to the first media source that will be
* removed. This index must be in the range of 0 &lt;= index &lt; {@link #getSize()}. * removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
* @param toIndex The final range index, pointing to the first media source that will be left * @param toIndex The final range index, pointing to the first media source that will be left
* untouched. The last media source to be removed is at index {@code toIndex} - 1. * untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
* This index must be in the range of 0 &lt;= index &lt; {@link #getSize()}. * @throws IndexOutOfBoundsException When the range is malformed, i.e. {@code fromIndex} &lt;
* * 0, {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
* @throws IndexOutOfBoundsException when either index is out of playlist bounds, i.e. {@code
* fromIndex} &lt; 0 or &gt;= {@link #getSize()}, {@code toIndex} &lt; 0 or &gt; {@link
* #getSize()}
* @throws IndexOutOfBoundsException when range is malformed, i.e. {@code fromIndex} &gt;
* {@code toIndex}
*/ */
public final synchronized void removeMediaSourceRange(int fromIndex, int toIndex) { public final synchronized void removeMediaSourceRange(int fromIndex, int toIndex) {
removeMediaSourceRange(fromIndex, toIndex, null); removeMediaSourceRange(fromIndex, toIndex, null);
@ -335,37 +330,23 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
* is thrown. * is thrown.
* *
* @param fromIndex The initial range index, pointing to the first media source that will be * @param fromIndex The initial range index, pointing to the first media source that will be
* removed. This index must be in the range of 0 &lt;= index &lt; {@link #getSize()}. * removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
* @param toIndex The final range index, pointing to the first media source that will be left * @param toIndex The final range index, pointing to the first media source that will be left
* untouched. The last media source to be removed is at index {@code toIndex} - 1. * untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
* This index must be in the range of 0 &lt;= index &lt; {@link #getSize()}.
*
* @throws IndexOutOfBoundsException when either index is out of playlist bounds, i.e. {@code
* fromIndex} &lt; 0 or &gt;= {@link #getSize()}, {@code toIndex} &lt; 0 or &gt; {@link
* #getSize()}
* @throws IndexOutOfBoundsException when range is malformed, i.e. {@code fromIndex} &gt;
* {@code toIndex}
* @param actionOnCompletion A {@link Runnable} which is executed immediately after the media * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
* source range has been removed from the playlist. * source range has been removed from the playlist.
* @throws IndexOutOfBoundsException When the range is malformed, i.e. {@code fromIndex} &lt;
* 0, {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
*/ */
public final synchronized void removeMediaSourceRange( public final synchronized void removeMediaSourceRange(
int fromIndex, int toIndex, @Nullable Runnable actionOnCompletion) { int fromIndex, int toIndex, @Nullable Runnable actionOnCompletion) {
if (fromIndex < 0 || fromIndex >= mediaSourcesPublic.size()) { Util.removeRange(mediaSourcesPublic, fromIndex, toIndex);
throw new IndexOutOfBoundsException(String.format("Cannot remove source range: initial index (%d) out of bounds", fromIndex));
}
if (toIndex < 0 || toIndex > mediaSourcesPublic.size()) {
throw new IndexOutOfBoundsException(String.format("Cannot remove source range: final index (%d) out of bounds", toIndex));
}
if (fromIndex > toIndex) {
throw new IndexOutOfBoundsException(String.format("Cannot remove source range: range malformed (%d, %d)", fromIndex, toIndex));
}
if (fromIndex == toIndex) { if (fromIndex == toIndex) {
if (actionOnCompletion != null) { if (actionOnCompletion != null) {
actionOnCompletion.run(); actionOnCompletion.run();
} }
return; return;
} }
mediaSourcesPublic.subList(fromIndex, toIndex).clear();
if (player != null) { if (player != null) {
player player
.createMessage(this) .createMessage(this)