Commit d4a03d3b by tonihei Committed by Oliver Woodman

Remove some superfluous "custom"s.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192100852
parent 60aecdf3
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
* Added callbacks to `MediaSourceEventListener` to get notified when media * Added callbacks to `MediaSourceEventListener` to get notified when media
periods are created, released and being read from. periods are created, released and being read from.
* Support live stream clipping with `ClippingMediaSource`. * Support live stream clipping with `ClippingMediaSource`.
* Allow setting custom tags for all media sources in their factories. The tag * Allow setting tags for all media sources in their factories. The tag of the
of the current window can be retrieved with `ExoPlayer.getCurrentTag`. current window can be retrieved with `ExoPlayer.getCurrentTag`.
* Audio: * Audio:
* Factor out `AudioTrack` position tracking from `DefaultAudioSink`. * Factor out `AudioTrack` position tracking from `DefaultAudioSink`.
* Fix an issue where the playback position would pause just after playback * Fix an issue where the playback position would pause just after playback
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.support.annotation.Nullable;
import android.util.Pair; import android.util.Pair;
import com.google.android.exoplayer2.source.ads.AdPlaybackState; import com.google.android.exoplayer2.source.ads.AdPlaybackState;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -118,8 +119,8 @@ public abstract class Timeline { ...@@ -118,8 +119,8 @@ public abstract class Timeline {
*/ */
public static final class Window { public static final class Window {
/** A custom tag for the window. Not necessarily unique. */ /** A tag for the window. Not necessarily unique. */
public Object tag; public @Nullable Object tag;
/** /**
* The start time of the presentation to which this window belongs in milliseconds since the * The start time of the presentation to which this window belongs in milliseconds since the
...@@ -174,7 +175,7 @@ public abstract class Timeline { ...@@ -174,7 +175,7 @@ public abstract class Timeline {
/** Sets the data held by this window. */ /** Sets the data held by this window. */
public Window set( public Window set(
Object tag, @Nullable Object tag,
long presentationStartTimeMs, long presentationStartTimeMs,
long windowStartTimeMs, long windowStartTimeMs,
boolean isSeekable, boolean isSeekable,
......
...@@ -54,7 +54,7 @@ public final class SinglePeriodTimeline extends Timeline { ...@@ -54,7 +54,7 @@ public final class SinglePeriodTimeline extends Timeline {
* @param durationUs The duration of the period, in microseconds. * @param durationUs The duration of the period, in microseconds.
* @param isSeekable Whether seeking is supported within the period. * @param isSeekable Whether seeking is supported within the period.
* @param isDynamic Whether the window may change when the timeline is updated. * @param isDynamic Whether the window may change when the timeline is updated.
* @param tag A custom tag used for {@link Timeline.Window#tag}. * @param tag A tag used for {@link Timeline.Window#tag}.
*/ */
public SinglePeriodTimeline( public SinglePeriodTimeline(
long durationUs, boolean isSeekable, boolean isDynamic, @Nullable Object tag) { long durationUs, boolean isSeekable, boolean isDynamic, @Nullable Object tag) {
...@@ -80,7 +80,7 @@ public final class SinglePeriodTimeline extends Timeline { ...@@ -80,7 +80,7 @@ public final class SinglePeriodTimeline extends Timeline {
* which to begin playback, in microseconds. * which to begin playback, in microseconds.
* @param isSeekable Whether seeking is supported within the window. * @param isSeekable Whether seeking is supported within the window.
* @param isDynamic Whether the window may change when the timeline is updated. * @param isDynamic Whether the window may change when the timeline is updated.
* @param tag A custom tag used for {@link Timeline.Window#tag}. * @param tag A tag used for {@link Timeline.Window#tag}.
*/ */
public SinglePeriodTimeline( public SinglePeriodTimeline(
long periodDurationUs, long periodDurationUs,
...@@ -117,8 +117,7 @@ public final class SinglePeriodTimeline extends Timeline { ...@@ -117,8 +117,7 @@ public final class SinglePeriodTimeline extends Timeline {
* which to begin playback, in microseconds. * which to begin playback, in microseconds.
* @param isSeekable Whether seeking is supported within the window. * @param isSeekable Whether seeking is supported within the window.
* @param isDynamic Whether the window may change when the timeline is updated. * @param isDynamic Whether the window may change when the timeline is updated.
* @param tag A custom tag used for {@link Timeline.Window#tag}. If null, an arbitrary default tag * @param tag A tag used for {@link Timeline.Window#tag}.
* is used.
*/ */
public SinglePeriodTimeline( public SinglePeriodTimeline(
long presentationStartTimeMs, long presentationStartTimeMs,
......
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