diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java index f02ec3dd43..0374c04cb3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java @@ -93,8 +93,8 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; * *
The figure below shows ExoPlayer's threading model. * - *
+ *
*
*
+ *
*/
public interface Renderer extends PlayerMessage.Target {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index f99c4f47e0..93a87da0dc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -45,7 +45,7 @@ import com.google.android.exoplayer2.util.Util;
*
*
A timeline for a single media file or on-demand stream consists of a single period
* and window. The window spans the whole period, indicating that all parts of the media are
* available for playback. The window's default position is typically at the start of the period
@@ -53,17 +53,17 @@ import com.google.android.exoplayer2.util.Util;
*
*
A timeline for a playlist of media files or on-demand streams consists of multiple
- * periods, each with its own window. Each window spans the whole of the corresponding period, and
- * typically has a default position at the start of the period. The properties of the periods and
- * windows (e.g. their durations and whether the window is seekable) will often only become known
- * when the player starts buffering the corresponding file or stream.
+ *
A timeline for a playlist of media files or on-demand streams consists of
+ * multiple periods, each with its own window. Each window spans the whole of the corresponding
+ * period, and typically has a default position at the start of the period. The properties of the
+ * periods and windows (e.g. their durations and whether the window is seekable) will often only
+ * become known when the player starts buffering the corresponding file or stream.
*
*
A timeline for a live stream consists of a period whose
+ *
A timeline for a live stream consists of a period whose
* duration is unknown, since it's continually extending as more content is broadcast. If content
* only remains available for a limited period of time then the window may start at a non-zero
* position, defining the region of content that can still be played. The window will have {@link
@@ -73,24 +73,24 @@ import com.google.android.exoplayer2.util.Util;
*
*
A timeline for a live stream with indefinite
+ *
A timeline for a live stream with indefinite
* availability is similar to the Live stream with limited availability
* case, except that the window starts at the beginning of the period to indicate that all of the
* previously broadcast content can still be played.
*
*
This case arises when a live stream is explicitly divided
- * into separate periods, for example at content boundaries. This case is similar to the
This case arises when a live stream is explicitly
+ * divided into separate periods, for example at content boundaries. This case is similar to the Live stream with limited availability case, except that the window may
* span more than one period. Multiple periods are also possible in the indefinite availability
* case.
*
*
This case is the concatenation of the Single media file or on-demand stream and Live
* stream with multiple periods cases. When playback of the on-demand stream ends, playback of
@@ -98,10 +98,10 @@ import com.google.android.exoplayer2.util.Util;
*
*
This case includes mid-roll ad groups, which
- * are defined as part of the timeline's single period. The period can be queried for information
- * about the ad groups and the ads they contain.
+ *
This case includes mid-roll ad groups,
+ * which are defined as part of the timeline's single period. The period can be queried for
+ * information about the ad groups and the ads they contain.
*/
public abstract class Timeline {
@@ -112,7 +112,7 @@ public abstract class Timeline {
* shows some of the information defined by a window, as well as how this information relates to
* corresponding {@link Period Periods} in the timeline.
*
- *
*/
public static final class Window {
@@ -327,12 +327,12 @@ public abstract class Timeline {
* Holds information about a period in a {@link Timeline}. A period defines a single logical piece
* of media, for example a media file. It may also define groups of ads inserted into the media,
* along with information about whether those ads have been loaded and played.
- *
- * The figure below shows some of the information defined by a period, as well as how this + * + *
The figure below shows some of the information defined by a period, as well as how this * information relates to a corresponding {@link Window} in the timeline. - *
- *
- *
*/
public static final class Period {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
index fb74bd9d54..bc6cf14371 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
@@ -36,8 +36,6 @@ import com.google.android.exoplayer2.util.Assertions;
*
* The following interactions occur between the player and its track selector during playback.
*
- *
- * *