Skip to content

SDK / exoplayer

Go to a project
Commit 1440cad5 by olly Committed by Oliver Woodman
Options

Fix build warnings under exoplayer/v2/library 

- Removes empty <p> tag in javadoc
- Removes incorrect parameter name warnings for var args.

PiperOrigin-RevId: 294555651
parent 44046860
Inline Side-by-side
Showing with 12 additions and 18 deletions
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -459,7 +459,7 @@ public final class ExoPlayerTest { ...@@ -459,7 +459,7 @@ public final class ExoPlayerTest {
public void testAdGroupWithLoadErrorIsSkipped() throws Exception { public void testAdGroupWithLoadErrorIsSkipped() throws Exception {
AdPlaybackState initialAdPlaybackState = AdPlaybackState initialAdPlaybackState =
FakeTimeline.createAdPlaybackState( FakeTimeline.createAdPlaybackState(
/* adsPerAdGroup= */ 1, /* adGroupTimesUs= */ 5 * C.MICROS_PER_SECOND); /* adsPerAdGroup= */ 1, /* adGroupTimesUs=... */ 5 * C.MICROS_PER_SECOND);
Timeline fakeTimeline = Timeline fakeTimeline =
new FakeTimeline( new FakeTimeline(
new TimelineWindowDefinition( new TimelineWindowDefinition(
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
...@@ -609,7 +609,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -609,7 +609,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* isSeekable= */ true, /* isSeekable= */ true,
/* isDynamic= */ false, /* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND, /* durationUs =*/ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(/* adGroupTimesUs= */ C.TIME_END_OF_SOURCE) new AdPlaybackState(/* adGroupTimesUs=... */ C.TIME_END_OF_SOURCE)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1))); .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)));
EventTime adEventTime = EventTime adEventTime =
createEventTime( createEventTime(
...@@ -820,7 +820,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -820,7 +820,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* isSeekable= */ true, /* isSeekable= */ true,
/* isDynamic= */ false, /* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND, /* durationUs =*/ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(/* adGroupTimesUs= */ 0, 5 * C.MICROS_PER_SECOND) new AdPlaybackState(/* adGroupTimesUs=... */ 0, 5 * C.MICROS_PER_SECOND)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1)));
EventTime adEventTime1 = EventTime adEventTime1 =
...@@ -881,7 +881,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -881,7 +881,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* isDynamic= */ false, /* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND, /* durationUs =*/ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState( new AdPlaybackState(
/* adGroupTimesUs= */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) /* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1)));
EventTime adEventTime1 = EventTime adEventTime1 =
...@@ -932,7 +932,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -932,7 +932,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* isSeekable= */ true, /* isSeekable= */ true,
/* isDynamic= */ false, /* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND, /* durationUs =*/ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(/* adGroupTimesUs= */ 0, 5 * C.MICROS_PER_SECOND) new AdPlaybackState(/* adGroupTimesUs=... */ 0, 5 * C.MICROS_PER_SECOND)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1)));
EventTime adEventTime1 = EventTime adEventTime1 =
...@@ -1004,7 +1004,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -1004,7 +1004,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* isDynamic= */ false, /* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND, /* durationUs =*/ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState( new AdPlaybackState(
/* adGroupTimesUs= */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) /* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1)));
EventTime adEventTime1 = EventTime adEventTime1 =
......
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
...@@ -666,7 +666,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -666,7 +666,7 @@ public final class ConcatenatingMediaSourceTest {
false, false,
10 * C.MICROS_PER_SECOND, 10 * C.MICROS_PER_SECOND,
FakeTimeline.createAdPlaybackState( FakeTimeline.createAdPlaybackState(
/* adsPerAdGroup= */ 1, /* adGroupTimesUs= */ 0))); /* adsPerAdGroup= */ 1, /* adGroupTimesUs=... */ 0)));
FakeMediaSource mediaSourceContentOnly = new FakeMediaSource(timelineContentOnly); FakeMediaSource mediaSourceContentOnly = new FakeMediaSource(timelineContentOnly);
FakeMediaSource mediaSourceWithAds = new FakeMediaSource(timelineWithAds); FakeMediaSource mediaSourceWithAds = new FakeMediaSource(timelineWithAds);
mediaSource.addMediaSource(mediaSourceContentOnly); mediaSource.addMediaSource(mediaSourceContentOnly);
...@@ -837,7 +837,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -837,7 +837,7 @@ public final class ConcatenatingMediaSourceTest {
new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 5), new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 5),
new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 7)); new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 7));
// Assert that only one manifest load is reported because the source is reused. // Assert that only one manifest load is reported because the source is reused.
testRunner.assertCompletedManifestLoads(/* windowIndices= */ 0); testRunner.assertCompletedManifestLoads(/* windowIndices=... */ 0);
assertCompletedAllMediaPeriodLoads(timeline); assertCompletedAllMediaPeriodLoads(timeline);
testRunner.releaseSource(); testRunner.releaseSource();
...@@ -870,7 +870,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -870,7 +870,7 @@ public final class ConcatenatingMediaSourceTest {
new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 3), new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 3),
new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 4)); new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 4));
// Assert that only one manifest load is needed because the source is reused. // Assert that only one manifest load is needed because the source is reused.
testRunner.assertCompletedManifestLoads(/* windowIndices= */ 0); testRunner.assertCompletedManifestLoads(/* windowIndices=... */ 0);
assertCompletedAllMediaPeriodLoads(timeline); assertCompletedAllMediaPeriodLoads(timeline);
testRunner.releaseSource(); testRunner.releaseSource();
......
library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
...@@ -72,7 +72,7 @@ public final class AdaptiveTrackSelectionTest { ...@@ -72,7 +72,7 @@ public final class AdaptiveTrackSelectionTest {
new AdaptiveTrackSelection.Factory(initialBandwidthMeter) new AdaptiveTrackSelection.Factory(initialBandwidthMeter)
.createTrackSelections( .createTrackSelections(
new Definition[] { new Definition[] {
new Definition(new TrackGroup(format1, format2), /* tracks= */ 0, 1) new Definition(new TrackGroup(format1, format2), /* tracks=... */ 0, 1)
}, },
injectedBandwidthMeter); injectedBandwidthMeter);
trackSelections[0].updateSelectedTrack( trackSelections[0].updateSelectedTrack(
......
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
...@@ -1455,7 +1455,7 @@ public final class DefaultTrackSelectorTest { ...@@ -1455,7 +1455,7 @@ public final class DefaultTrackSelectorTest {
.setSelectionOverride( .setSelectionOverride(
/* rendererIndex= */ 0, /* rendererIndex= */ 0,
trackGroups, trackGroups,
new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2))); new SelectionOverride(/* groupIndex= */ 0, /* tracks=... */ 1, 2)));
TrackSelectorResult result = TrackSelectorResult result =
trackSelector.selectTracks( trackSelector.selectTracks(
new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE); new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
...@@ -1593,7 +1593,7 @@ public final class DefaultTrackSelectorTest { ...@@ -1593,7 +1593,7 @@ public final class DefaultTrackSelectorTest {
.setSelectionOverride( .setSelectionOverride(
/* rendererIndex= */ 0, /* rendererIndex= */ 0,
trackGroups, trackGroups,
new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2))); new SelectionOverride(/* groupIndex= */ 0, /* tracks=... */ 1, 2)));
TrackSelectorResult result = TrackSelectorResult result =
trackSelector.selectTracks( trackSelector.selectTracks(
new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE); new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE);
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
...@@ -55,8 +55,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -55,8 +55,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* *
* The following attributes can be set on a DefaultTimeBar when used in a layout XML file: * The following attributes can be set on a DefaultTimeBar when used in a layout XML file:
* *
* <p>
*
* <ul> * <ul>
* <li><b>{@code bar_height}</b> - Dimension for the height of the time bar. * <li><b>{@code bar_height}</b> - Dimension for the height of the time bar.
* <ul> * <ul>
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
...@@ -138,8 +138,6 @@ import java.util.concurrent.CopyOnWriteArrayList; ...@@ -138,8 +138,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
* ExoPlayer library, and will be inflated for use by PlayerControlView. The view identifies and * ExoPlayer library, and will be inflated for use by PlayerControlView. The view identifies and
* binds its children by looking for the following ids: * binds its children by looking for the following ids:
* *
* <p>
*
* <ul> * <ul>
* <li><b>{@code exo_play}</b> - The play button. * <li><b>{@code exo_play}</b> - The play button.
* <ul> * <ul>
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
...@@ -187,8 +187,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -187,8 +187,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* inflated for use by PlayerView. The view identifies and binds its children by looking for the * inflated for use by PlayerView. The view identifies and binds its children by looking for the
* following ids: * following ids:
* *
* <p>
*
* <ul> * <ul>
* <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video * <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video
* or album art of the media being played, and the configured {@code resize_mode}. The video * or album art of the media being played, and the configured {@code resize_mode}. The video
......
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