From 4b234388c89b40ff7db8d089619b8b0ab28f6ba3 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 15 Jan 2020 13:10:48 +0000 Subject: [PATCH] Move @Nullable annotations to correct positions PiperOrigin-RevId: 289838473 --- .../android/exoplayer2/MediaPeriodQueue.java | 6 ++-- .../audio/AudioCapabilitiesReceiver.java | 2 +- .../video/spherical/CameraMotionRenderer.java | 3 +- .../source/dash/manifest/SegmentBase.java | 28 ++++++++----------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java index 5b39db54aa..0b2802528e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java @@ -119,7 +119,8 @@ import com.google.android.exoplayer2.util.Assertions; * @return The {@link MediaPeriodInfo} for the next media period to load, or {@code null} if not * yet known. */ - public @Nullable MediaPeriodInfo getNextMediaPeriodInfo( + @Nullable + public MediaPeriodInfo getNextMediaPeriodInfo( long rendererPositionUs, PlaybackInfo playbackInfo) { return loading == null ? getFirstMediaPeriodInfo(playbackInfo) @@ -536,7 +537,8 @@ import com.google.android.exoplayer2.util.Assertions; * @return The following media period's info, or {@code null} if it is not yet possible to get the * next media period info. */ - private @Nullable MediaPeriodInfo getFollowingMediaPeriodInfo( + @Nullable + private MediaPeriodInfo getFollowingMediaPeriodInfo( MediaPeriodHolder mediaPeriodHolder, long rendererPositionUs) { // TODO: This method is called repeatedly from ExoPlayerImplInternal.maybeUpdateLoadingPeriod // but if the timeline is not ready to provide the next period it can't return a non-null value diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java index fe84c49656..991ed9ee97 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java @@ -54,7 +54,7 @@ public final class AudioCapabilitiesReceiver { @Nullable private final BroadcastReceiver receiver; @Nullable private final ExternalSurroundSoundSettingObserver externalSurroundSoundSettingObserver; - /* package */ @Nullable AudioCapabilities audioCapabilities; + @Nullable /* package */ AudioCapabilities audioCapabilities; private boolean registered; /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java index 35804adbe3..9260ff8bf4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java @@ -112,7 +112,8 @@ public class CameraMotionRenderer extends BaseRenderer { return true; } - private @Nullable float[] parseMetadata(ByteBuffer data) { + @Nullable + private float[] parseMetadata(ByteBuffer data) { if (data.remaining() != 16) { return null; } diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java index db7c8d6471..b5ca31c151 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java @@ -26,7 +26,7 @@ import java.util.List; */ public abstract class SegmentBase { - /* package */ @Nullable final RangedUri initialization; + @Nullable /* package */ final RangedUri initialization; /* package */ final long timescale; /* package */ final long presentationTimeOffset; @@ -116,7 +116,7 @@ public abstract class SegmentBase { /* package */ final long startNumber; /* package */ final long duration; - /* package */ @Nullable final List segmentTimeline; + @Nullable /* package */ final List segmentTimeline; /** * @param initialization A {@link RangedUri} corresponding to initialization data, if such data @@ -233,12 +233,10 @@ public abstract class SegmentBase { } - /** - * A {@link MultiSegmentBase} that uses a SegmentList to define its segments. - */ - public static class SegmentList extends MultiSegmentBase { + /** A {@link MultiSegmentBase} that uses a SegmentList to define its segments. */ + public static final class SegmentList extends MultiSegmentBase { - /* package */ @Nullable final List mediaSegments; + @Nullable /* package */ final List mediaSegments; /** * @param initialization A {@link RangedUri} corresponding to initialization data, if such data @@ -285,13 +283,11 @@ public abstract class SegmentBase { } - /** - * A {@link MultiSegmentBase} that uses a SegmentTemplate to define its segments. - */ - public static class SegmentTemplate extends MultiSegmentBase { + /** A {@link MultiSegmentBase} that uses a SegmentTemplate to define its segments. */ + public static final class SegmentTemplate extends MultiSegmentBase { - /* package */ @Nullable final UrlTemplate initializationTemplate; - /* package */ @Nullable final UrlTemplate mediaTemplate; + @Nullable /* package */ final UrlTemplate initializationTemplate; + @Nullable /* package */ final UrlTemplate mediaTemplate; /* package */ final long endNumber; /** @@ -378,10 +374,8 @@ public abstract class SegmentBase { } } - /** - * Represents a timeline segment from the MPD's SegmentTimeline list. - */ - public static class SegmentTimelineElement { + /** Represents a timeline segment from the MPD's SegmentTimeline list. */ + public static final class SegmentTimelineElement { /* package */ final long startTime; /* package */ final long duration;