From 34f23451e66ca85a32a072ad4eada271fd79f898 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 20 Jun 2023 17:23:37 +0000 Subject: [PATCH] Switch to SVG assets hosted on developer.android.com for reference docs #minor-release PiperOrigin-RevId: 541970884 --- .../java/androidx/media3/common/Timeline.java | 22 ++++---- .../common/doc-files/timeline-advanced.svg | 3 -- .../doc-files/timeline-live-indefinite.svg | 3 -- .../doc-files/timeline-live-limited.svg | 3 -- .../doc-files/timeline-live-multi-period.svg | 3 -- .../common/doc-files/timeline-period.svg | 3 -- .../common/doc-files/timeline-playlist.svg | 3 -- .../timeline-single-file-midrolls.svg | 51 ------------------- .../common/doc-files/timeline-single-file.svg | 3 -- .../common/doc-files/timeline-window.svg | 3 -- .../androidx/media3/exoplayer/ExoPlayer.java | 6 +-- .../androidx/media3/exoplayer/Renderer.java | 6 +-- .../doc-files/exoplayer-threading-model.svg | 3 -- .../exoplayer/doc-files/renderer-states.svg | 3 -- 14 files changed, 17 insertions(+), 98 deletions(-) delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-advanced.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-indefinite.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-limited.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-multi-period.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-period.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-playlist.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file-midrolls.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file.svg delete mode 100644 libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-window.svg delete mode 100644 libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/exoplayer-threading-model.svg delete mode 100644 libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/renderer-states.svg 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 879ae7ae843..42844973cde 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Timeline.java +++ b/libraries/common/src/main/java/androidx/media3/common/Timeline.java @@ -37,8 +37,8 @@ import java.util.ArrayList; import java.util.List; -// TODO(b/276289331): Revert to media3-hosted SVG links below once they're available on -// developer.android.com. +// TODO: b/288080357 - Replace developer.android.com fully-qualified SVG URLs below with relative +// URLs once we stop publishing exoplayer2 javadoc. /** * A flexible representation of the structure of media. A timeline is able to represent the @@ -65,7 +65,7 @@ *

Single media file or on-demand stream

* *

Example timeline for a single file * *

A timeline for a single media file or on-demand stream consists of a single period and window. @@ -76,7 +76,7 @@ *

Playlist of media files or on-demand streams

* *

Example timeline for a playlist of files * *

A timeline for a playlist of media files or on-demand streams consists of multiple periods, @@ -88,7 +88,7 @@ *

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 @@ -102,7 +102,7 @@ *

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 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 @@ -124,7 +124,7 @@ *

On-demand stream followed by 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 @@ -135,7 +135,7 @@ *

On-demand stream with mid-roll ads

* *

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 @@ -151,7 +151,7 @@ public abstract class Timeline implements Bundleable { * corresponding {@link Period Periods} in the timeline. * *

Information defined by a timeline window */ public static final class Window implements Bundleable { @@ -560,7 +560,7 @@ private static Window fromBundle(Bundle bundle) { * information relates to a corresponding {@link Window} in the timeline. * *

Information defined by a period */ public static final class Period implements Bundleable { diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-advanced.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-advanced.svg deleted file mode 100644 index e7a9960acc1..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-advanced.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period2period3window2timeperiod1window1 diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-indefinite.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-indefinite.svg deleted file mode 100644 index d15b27b552f..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-indefinite.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1window1time diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-limited.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-limited.svg deleted file mode 100644 index 24c457424d5..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-limited.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1window1time diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-multi-period.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-multi-period.svg deleted file mode 100644 index e9528193f63..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-live-multi-period.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1period2window1time diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-period.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-period.svg deleted file mode 100644 index 05a5b259ee2..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-period.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1period2window1period1.positionInWindowperiod2.positionInWindowperiod1.windowIndexperiod2.windowIndexperiod1.durationperiod2.duration (unset) diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-playlist.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-playlist.svg deleted file mode 100644 index 5b775de6a5f..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-playlist.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1window1period2period3window2window3time diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file-midrolls.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file-midrolls.svg deleted file mode 100644 index a3645873205..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file-midrolls.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - Produced by OmniGraffle 7.4 - 2017-07-19 14:26:00 +0000 - - - - - - - - - - - - - - - Canvas 1 - - - Layer 1 - - - - period1 - - - - - window1 - - - - - - - time - - - - - - - - - - - - diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file.svg deleted file mode 100644 index b9435ed95fc..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-single-file.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1window1time diff --git a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-window.svg b/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-window.svg deleted file mode 100644 index aaa4b7738b4..00000000000 --- a/libraries/common/src/main/javadoc/androidx/media3/common/doc-files/timeline-window.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1period1period2window1window1.positionInFirstPeriodwindow1.durationwindow1.defaultStartPositionwindow1.firstPeriodIndexwindow1.lastPeriodIndex 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 60b62bf358d..25df24b2275 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java @@ -130,7 +130,7 @@ *

The figure below shows 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. +// TODO: b/288080357 - Replace developer.android.com fully-qualified SVG URL above with a relative +// URL once we stop publishing exoplayer2 javadoc. 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 739337df6d5..fcfbcd3c669 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/Renderer.java @@ -51,11 +51,11 @@ * transition. * *

Renderer state transitions */ -// TODO(b/276289331): Revert to media3-hosted SVG links above once they're available on -// developer.android.com. +// TODO: b/288080357 - Replace developer.android.com fully-qualified SVG URL above with a relative +// URL once we stop publishing exoplayer2 javadoc. @UnstableApi public interface Renderer extends PlayerMessage.Target { diff --git a/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/exoplayer-threading-model.svg b/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/exoplayer-threading-model.svg deleted file mode 100644 index ec591c7516e..00000000000 --- a/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/exoplayer-threading-model.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6.1 2016-08-30 16:05:23 +0000Canvas 1Layer 1ExoPlayerApplication codeLoadControlTrackSelectorMediaSourceRenderersApplication visible stateMessage queueMessage queueapplication threadinternal playback threadbackground thread(s)playback loopget*()prepare()seekTo()etc…Listener calls diff --git a/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/renderer-states.svg b/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/renderer-states.svg deleted file mode 100644 index 3882ca28bd6..00000000000 --- a/libraries/exoplayer/src/main/javadoc/androidx/media3/exoplayer/doc-files/renderer-states.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.6 2016-08-19 23:45:45 +0000Canvas 1Layer 1DisabledEnabledStartedenablestartstopdisablereplaceStreamreplaceStream