From 2e4f49fef741c21f47590d3a818b6ed43d94fc04 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 30 Mar 2023 15:35:23 +0000 Subject: [PATCH] Temporarily use exoplayer2-hosted SVGs in media3 javadoc The media3-hosted versions of these SVGs were removed due to a change in the way the reference docs are generated. While work on getting them hosted on developer.android.com, this change simply links to the (identical) exoplayer2 versions in order to fix the media3 docs. #minor-release PiperOrigin-RevId: 520647905 --- .../java/androidx/media3/common/Timeline.java | 37 ++++++++++++------- .../androidx/media3/exoplayer/ExoPlayer.java | 7 +++- .../androidx/media3/exoplayer/Renderer.java | 7 +++- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/Timeline.java b/libraries/common/src/main/java/androidx/media3/common/Timeline.java index 70e35e2431..2ddcdc26ca 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Timeline.java +++ b/libraries/common/src/main/java/androidx/media3/common/Timeline.java @@ -61,8 +61,9 @@ import java.util.List; * *

Single media file or on-demand stream

* - *

Example timeline for a - * single file + *

Example timeline for a single file * *

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 @@ -71,8 +72,9 @@ import java.util.List; * *

Playlist of media files or on-demand streams

* - *

Example timeline for a - * playlist of files + *

Example timeline for a playlist of files * *

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 @@ -82,8 +84,9 @@ import java.util.List; * *

Live stream with limited availability

* - *

Example timeline for - * a live stream with limited availability + *

Example timeline for a live stream with limited availability * *

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 @@ -95,8 +98,9 @@ import java.util.List; * *

Live stream with indefinite availability

* - *

Example timeline - * for a live stream with indefinite availability + *

Example timeline for a live stream with indefinite availability * *

A timeline for a live stream with indefinite availability is similar to the Live stream with limited availability case, except that the window @@ -105,8 +109,9 @@ import java.util.List; * *

Live stream with multiple periods

* - *

Example timeline - * for a live stream with multiple periods + *

Example timeline for a live stream with multiple periods * *

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 @@ -115,8 +120,9 @@ import java.util.List; * *

On-demand stream followed by live stream

* - *

Example timeline for an - * on-demand stream followed by a live stream + *

Example timeline for an on-demand stream followed by a live stream * *

This case is the concatenation of the Single media file or on-demand * stream and Live stream with multiple periods cases. When playback @@ -125,12 +131,15 @@ import java.util.List; * *

On-demand stream with mid-roll ads

* - *

Example - * timeline for an on-demand stream with mid-roll ad groups + *

Example timeline for an on-demand stream with mid-roll ad groups * *

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. */ +// TODO(b/276289331): Revert to media3-hosted SVG links above once they're available on +// developer.android.com. public abstract class Timeline implements Bundleable { /** diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java index 6c53b20e14..bb40ee654a 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java @@ -129,8 +129,9 @@ import java.util.List; * *

The figure below shows ExoPlayer's threading model. * - *

ExoPlayer's - * threading model + *

ExoPlayer's threading model * *

*/ +// TODO(b/276289331): Revert to media3-hosted SVG links above once they're available on +// developer.android.com. public interface ExoPlayer extends Player { /** diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java index 6fe54fccdb..739337df6d 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java @@ -50,9 +50,12 @@ import java.util.List; * valid state transitions are shown below, annotated with the methods that are called during each * transition. * - *

Renderer state - * transitions + *

Renderer state transitions */ +// TODO(b/276289331): Revert to media3-hosted SVG links above once they're available on +// developer.android.com. @UnstableApi public interface Renderer extends PlayerMessage.Target {