loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 23:50:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move @Nullable annotations to correct positions

Browse Source 
PiperOrigin-RevId: 289838473
This commit is contained in:
olly 2020-01-15 13:10:48 +00:00 committed by Oliver Woodman
parent 96c648c2d6
commit 4b234388c8
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
View File

@ -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 * @return The {@link MediaPeriodInfo} for the next media period to load, or {@code null} if not
* yet known. * yet known.
*/ */
public @Nullable MediaPeriodInfo getNextMediaPeriodInfo( @Nullable
public MediaPeriodInfo getNextMediaPeriodInfo(
long rendererPositionUs, PlaybackInfo playbackInfo) { long rendererPositionUs, PlaybackInfo playbackInfo) {
return loading == null return loading == null
? getFirstMediaPeriodInfo(playbackInfo) ? 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 * @return The following media period's info, or {@code null} if it is not yet possible to get the
* next media period info. * next media period info.
*/ */
private @Nullable MediaPeriodInfo getFollowingMediaPeriodInfo( @Nullable
private MediaPeriodInfo getFollowingMediaPeriodInfo(
MediaPeriodHolder mediaPeriodHolder, long rendererPositionUs) { MediaPeriodHolder mediaPeriodHolder, long rendererPositionUs) {
// TODO: This method is called repeatedly from ExoPlayerImplInternal.maybeUpdateLoadingPeriod // 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 // but if the timeline is not ready to provide the next period it can't return a non-null value

2
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
View File

@ -54,7 +54,7 @@ public final class AudioCapabilitiesReceiver {
@Nullable private final BroadcastReceiver receiver; @Nullable private final BroadcastReceiver receiver;
@Nullable private final ExternalSurroundSoundSettingObserver externalSurroundSoundSettingObserver; @Nullable private final ExternalSurroundSoundSettingObserver externalSurroundSoundSettingObserver;
/* package */ @Nullable AudioCapabilities audioCapabilities; @Nullable /* package */ AudioCapabilities audioCapabilities;
private boolean registered; private boolean registered;
/** /**

3
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
View File

@ -112,7 +112,8 @@ public class CameraMotionRenderer extends BaseRenderer {
return true; return true;
} }
private @Nullable float[] parseMetadata(ByteBuffer data) { @Nullable
private float[] parseMetadata(ByteBuffer data) {
if (data.remaining() != 16) { if (data.remaining() != 16) {
return null; return null;
} }

28
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
View File

@ -26,7 +26,7 @@ import java.util.List;
*/ */
public abstract class SegmentBase { public abstract class SegmentBase {
/* package */ @Nullable final RangedUri initialization; @Nullable /* package */ final RangedUri initialization;
/* package */ final long timescale; /* package */ final long timescale;
/* package */ final long presentationTimeOffset; /* package */ final long presentationTimeOffset;
@ -116,7 +116,7 @@ public abstract class SegmentBase {
/* package */ final long startNumber; /* package */ final long startNumber;
/* package */ final long duration; /* package */ final long duration;
/* package */ @Nullable final List<SegmentTimelineElement> segmentTimeline; @Nullable /* package */ final List<SegmentTimelineElement> segmentTimeline;
/** /**
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data * @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. */
* A {@link MultiSegmentBase} that uses a SegmentList to define its segments. public static final class SegmentList extends MultiSegmentBase {
*/
public static class SegmentList extends MultiSegmentBase {
/* package */ @Nullable final List<RangedUri> mediaSegments; @Nullable /* package */ final List<RangedUri> mediaSegments;
/** /**
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data * @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. */
* A {@link MultiSegmentBase} that uses a SegmentTemplate to define its segments. public static final class SegmentTemplate extends MultiSegmentBase {
*/
public static class SegmentTemplate extends MultiSegmentBase {
/* package */ @Nullable final UrlTemplate initializationTemplate; @Nullable /* package */ final UrlTemplate initializationTemplate;
/* package */ @Nullable final UrlTemplate mediaTemplate; @Nullable /* package */ final UrlTemplate mediaTemplate;
/* package */ final long endNumber; /* package */ final long endNumber;
/** /**
@ -378,10 +374,8 @@ public abstract class SegmentBase {
} }
} }
/** /** Represents a timeline segment from the MPD's SegmentTimeline list. */
* Represents a timeline segment from the MPD's SegmentTimeline list. public static final class SegmentTimelineElement {
*/
public static class SegmentTimelineElement {
/* package */ final long startTime; /* package */ final long startTime;
/* package */ final long duration; /* package */ final long duration;