From 3e819d082a1bcbfa8d40bec9b3b2865173bd1405 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 11 Jun 2021 08:33:16 +0100 Subject: [PATCH] Make javadoc valid html5 As of [JDK-8247957](https://bugs.openjdk.java.net/browse/JDK-8247957), doclint no longer supports html4. Tested: Some test failures are present, but the CL author has decided to mail the change anyway PiperOrigin-RevId: 378819179 --- .../java/com/google/android/exoplayer2/Format.java | 12 ++++++------ .../com/google/android/exoplayer2/Timeline.java | 14 +++++++------- .../com/google/android/exoplayer2/ExoPlayer.java | 4 ++-- .../google/android/exoplayer2/drm/ExoMediaDrm.java | 2 +- .../source/DefaultMediaSourceFactory.java | 2 +- .../trackselection/DefaultTrackSelector.java | 10 +++++----- .../exoplayer2/trackselection/TrackSelector.java | 6 +++--- .../android/exoplayer2/upstream/cache/Cache.java | 2 +- .../exoplayer2/extractor/ExtractorInput.java | 4 ++-- .../android/exoplayer2/ui/DefaultTimeBar.java | 2 +- .../android/exoplayer2/ui/PlayerControlView.java | 8 ++++---- .../exoplayer2/ui/PlayerNotificationManager.java | 4 ++-- .../google/android/exoplayer2/ui/PlayerView.java | 8 ++++---- .../exoplayer2/ui/StyledPlayerControlView.java | 8 ++++---- .../android/exoplayer2/ui/StyledPlayerView.java | 8 ++++---- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Format.java b/library/common/src/main/java/com/google/android/exoplayer2/Format.java index 325f2f0505..83461f9626 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Format.java @@ -38,7 +38,7 @@ import java.util.List; * format being constructed. For information about different types of format, see ExoPlayer's Supported formats page. * - *

Fields commonly relevant to all formats

+ *

Fields commonly relevant to all formats

* * * - *

Fields relevant to container formats

+ *

Fields relevant to container formats

* * * - *

Fields relevant to sample formats

+ *

Fields relevant to sample formats

* * * - *

Fields relevant to video formats

+ *

Fields relevant to video formats

* * * - *

Fields relevant to audio formats

+ *

Fields relevant to audio formats

* * * - *

Fields relevant to text formats

+ *

Fields relevant to text formats

* * * - *

Ad support for media items with ad tag URIs

+ *

Ad support for media items with ad tag URIs

* *

To support media items with {@link MediaItem.PlaybackProperties#adsConfiguration ads * configuration}, {@link #setAdsLoaderProvider} and {@link #setAdViewProvider} need to be called to diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java index 19b1b03e59..e2858b79c3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java @@ -60,7 +60,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull; * to configurable {@link Parameters}, which can be set by calling {@link * #setParameters(Parameters)}. * - *

Modifying parameters

+ *

Modifying parameters

* * To modify only some aspects of the parameters currently used by a selector, it's possible to * obtain a {@link ParametersBuilder} initialized with the current {@link Parameters}. The desired @@ -93,7 +93,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull; * * Selection {@link Parameters} support many different options, some of which are described below. * - *

Selecting specific tracks

+ *

Selecting specific tracks

* * Track selection overrides can be used to select specific tracks. To specify an override for a * renderer, it's first necessary to obtain the tracks that have been mapped to it: @@ -120,7 +120,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull; * .setSelectionOverride(rendererIndex, rendererTrackGroups, selectionOverride)); * } * - *

Constraint based track selection

+ *

Constraint based track selection

* * Whilst track selection overrides make it possible to select specific tracks, the recommended way * of controlling which tracks are selected is by specifying constraints. For example consider the @@ -148,14 +148,14 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull; * only applied to periods whose tracks match those for which the override was set. * * - *

Disabling renderers

+ *

Disabling renderers

* * Renderers can be disabled using {@link ParametersBuilder#setRendererDisabled}. Disabling a * renderer differs from setting a {@code null} override because the renderer is disabled * unconditionally, whereas a {@code null} override is applied only when the track groups available * to the renderer match the {@link TrackGroupArray} for which it was specified. * - *

Tunneling

+ *

Tunneling

* * Tunneled playback can be enabled in cases where the combination of renderers and selected tracks * support it. Tunneled playback is enabled by passing an audio session ID to {@link 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 c1dee080df..88736c0a1c 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 @@ -32,7 +32,7 @@ import com.google.android.exoplayer2.util.Assertions; * the player's {@link Renderer}s. The {@link DefaultTrackSelector} implementation should be * suitable for most use cases. * - *

Interactions with the player

+ *

Interactions with the player

* * The following interactions occur between the player and its track selector during playback. * @@ -65,7 +65,7 @@ import com.google.android.exoplayer2.util.Assertions; * will call {@link InvalidationListener#onTrackSelectionsInvalidated()}. * * - *

Renderer configuration

+ *

Renderer configuration

* * The {@link TrackSelectorResult} returned by {@link #selectTracks(RendererCapabilities[], * TrackGroupArray, MediaPeriodId, Timeline)} contains not only {@link TrackSelection}s for each @@ -77,7 +77,7 @@ import com.google.android.exoplayer2.util.Assertions; * configure renderers in a particular way if certain tracks are selected. Hence it makes sense to * determine the track selection and corresponding renderer configurations in a single step. * - *

Threading model

+ *

Threading model

* * All calls made by the player into the track selector are on the player's internal playback * thread. The track selector may call {@link InvalidationListener#onTrackSelectionsInvalidated()} diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java index 3d3fa076fa..cdce51aa1c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java @@ -26,7 +26,7 @@ import java.util.Set; /** * A cache that supports partial caching of resources. * - *

Terminology

+ *

Terminology

* * * - *

{@link InputStream}-like methods

+ *

{@link InputStream}-like methods

* *

The {@code read()/peek()} and {@code skip()} methods provide {@link InputStream}-like * byte-level access operations. The {@code length} parameter is a maximum, and each method returns @@ -42,7 +42,7 @@ import java.io.InputStream; * the input was reached, or the method was interrupted, or the operation was aborted early for * another reason. * - *

Block-based methods

+ *

Block-based methods

* *

The {@code read/skip/peekFully()} and {@code advancePeekPosition()} methods assume the user * wants to read an entire block/frame/header of known length. diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java index 562ab0508b..8d5ed5f805 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java @@ -51,7 +51,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * *

A DefaultTimeBar can be customized by setting attributes, as outlined below. * - *

Attributes

+ *

Attributes

* * The following attributes can be set on a DefaultTimeBar when used in a layout XML file: * diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java index b048d770b1..173cc8d752 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java @@ -66,7 +66,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * methods), overriding drawables, overriding the view's layout file, or by specifying a custom view * layout file. * - *

Attributes

+ *

Attributes

* * The following attributes can be set on a PlayerControlView when used in a layout XML file: * @@ -138,7 +138,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * layout is overridden to specify a custom {@code exo_progress} (see below). * * - *

Overriding drawables

+ *

Overriding drawables

* * The drawables used by PlayerControlView (with its default layout file) can be overridden by * drawables with the same names defined in your application. The drawables that can be overridden @@ -162,7 +162,7 @@ import java.util.concurrent.CopyOnWriteArrayList; *
  • {@code exo_controls_vr} - The VR icon. * * - *

    Overriding the layout file

    + *

    Overriding the layout file

    * * To customize the layout of PlayerControlView throughout your app, or just for certain * configurations, you can define {@code exo_player_control_view.xml} layout files in your @@ -241,7 +241,7 @@ import java.util.concurrent.CopyOnWriteArrayList; *

    All child views are optional and so can be omitted if not required, however where defined they * must be of the expected type. * - *

    Specifying a custom layout file

    + *

    Specifying a custom layout file

    * * Defining your own {@code exo_player_control_view.xml} is useful to customize the layout of * PlayerControlView throughout your application. It's also possible to customize the layout for a diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index 70deeacc84..1ba21c7526 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -75,7 +75,7 @@ import java.util.Map; *

    If the player is released it must be removed from the manager by calling {@code * setPlayer(null)}. * - *

    Action customization

    + *

    Action customization

    * * Playback actions can be included or omitted as follows: * @@ -140,7 +140,7 @@ import java.util.Map; * * * - *

    Overriding drawables

    + *

    Overriding drawables

    * * The drawables used by PlayerNotificationManager can be overridden by drawables with the same * names defined in your application. The drawables that can be overridden are: diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java index 603b14c7bf..16089d9022 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java @@ -83,7 +83,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; * overriding drawables, overriding the view's layout file, or by specifying a custom view layout * file. * - *

    Attributes

    + *

    Attributes

    * * The following attributes can be set on a PlayerView when used in a layout XML file: * @@ -175,13 +175,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; * exo_controller} (see below). * * - *

    Overriding drawables

    + *

    Overriding drawables

    * * The drawables used by {@link PlayerControlView} (with its default layout file) can be overridden * by drawables with the same names defined in your application. See the {@link PlayerControlView} * documentation for a list of drawables that can be overridden. * - *

    Overriding the layout file

    + *

    Overriding the layout file

    * * To customize the layout of PlayerView throughout your app, or just for certain configurations, * you can define {@code exo_player_view.xml} layout files in your application {@code res/layout*} @@ -248,7 +248,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; *

    All child views are optional and so can be omitted if not required, however where defined they * must be of the expected type. * - *

    Specifying a custom layout file

    + *

    Specifying a custom layout file

    * * Defining your own {@code exo_player_view.xml} is useful to customize the layout of PlayerView * throughout your application. It's also possible to customize the layout for a single instance in diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java index 9771e8dc83..ce705daf63 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java @@ -88,7 +88,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * methods), overriding drawables, overriding the view's layout file, or by specifying a custom view * layout file. * - *

    Attributes

    + *

    Attributes

    * * The following attributes can be set on a StyledPlayerControlView when used in a layout XML file: * @@ -171,7 +171,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * unless the layout is overridden to specify a custom {@code exo_progress} (see below). * * - *

    Overriding drawables

    + *

    Overriding drawables

    * * The drawables used by StyledPlayerControlView (with its default layout file) can be overridden by * drawables with the same names defined in your application. The drawables that can be overridden @@ -196,7 +196,7 @@ import java.util.concurrent.CopyOnWriteArrayList; *
  • {@code exo_styled_controls_vr} - The VR icon. * * - *

    Overriding the layout file

    + *

    Overriding the layout file

    * * To customize the layout of StyledPlayerControlView throughout your app, or just for certain * configurations, you can define {@code exo_styled_player_control_view.xml} layout files in your @@ -301,7 +301,7 @@ import java.util.concurrent.CopyOnWriteArrayList; *

    All child views are optional and so can be omitted if not required, however where defined they * must be of the expected type. * - *

    Specifying a custom layout file

    + *

    Specifying a custom layout file

    * * Defining your own {@code exo_styled_player_control_view.xml} is useful to customize the layout of * StyledPlayerControlView throughout your application. It's also possible to customize the layout diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java index 3c224f99b9..4873bb69ab 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java @@ -84,7 +84,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; * overriding drawables, overriding the view's layout file, or by specifying a custom view layout * file. * - *

    Attributes

    + *

    Attributes

    * * The following attributes can be set on a StyledPlayerView when used in a layout XML file: * @@ -176,13 +176,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; * custom {@code exo_controller} (see below). * * - *

    Overriding drawables

    + *

    Overriding drawables

    * * The drawables used by {@link StyledPlayerControlView} (with its default layout file) can be * overridden by drawables with the same names defined in your application. See the {@link * StyledPlayerControlView} documentation for a list of drawables that can be overridden. * - *

    Overriding the layout file

    + *

    Overriding the layout file

    * * To customize the layout of StyledPlayerView throughout your app, or just for certain * configurations, you can define {@code exo_styled_player_view.xml} layout files in your @@ -249,7 +249,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; *

    All child views are optional and so can be omitted if not required, however where defined they * must be of the expected type. * - *

    Specifying a custom layout file

    + *

    Specifying a custom layout file

    * * Defining your own {@code exo_styled_player_view.xml} is useful to customize the layout of * StyledPlayerView throughout your application. It's also possible to customize the layout for a