sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace @MonotonicNonNull with @Nullable for final variables.

Browse source 
@MonotonicNonNull is not useful if the variable is final, because it's only
assigned once and guaranteed to keep it's current nullability in the same
way as @MonotonicNonNull ensures it's kept non-null after checking.

This way, the workarounds can also be removed.

PiperOrigin-RevId: 275428656
This commit is contained in:
tonihei 2019-10-18 09:41:44 +01:00 committed by Oliver Woodman
parent 39d5f14343
commit 16a6946f3e
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
View file

@ -196,11 +196,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/** The url of the playlist from which this chunk was obtained. */ /** The url of the playlist from which this chunk was obtained. */
public final Uri playlistUrl; public final Uri playlistUrl;
// These should be final, but can't be due to @Nullable private final DataSource initDataSource;
// https://github.com/typetools/checker-framework/issues/2215 @Nullable private final DataSpec initDataSpec;
@MonotonicNonNull private DataSource initDataSource; @Nullable private final Extractor previousExtractor;
@MonotonicNonNull private DataSpec initDataSpec;
@MonotonicNonNull private Extractor previousExtractor;
private final boolean isMasterTimestampSource; private final boolean isMasterTimestampSource;
private final boolean hasGapTag; private final boolean hasGapTag;
@ -260,12 +258,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
chunkMediaSequence); chunkMediaSequence);
this.mediaSegmentEncrypted = mediaSegmentEncrypted; this.mediaSegmentEncrypted = mediaSegmentEncrypted;
this.discontinuitySequenceNumber = discontinuitySequenceNumber; this.discontinuitySequenceNumber = discontinuitySequenceNumber;
// Workaround for https://github.com/typetools/checker-framework/issues/2215
if (initDataSpec != null) {
this.initDataSpec = initDataSpec; this.initDataSpec = initDataSpec;
this.initDataSource = Assertions.checkNotNull(initDataSource); this.initDataSource = initDataSource;
initDataLoadRequired = true; this.initDataLoadRequired = initDataSpec != null;
}
this.initSegmentEncrypted = initSegmentEncrypted; this.initSegmentEncrypted = initSegmentEncrypted;
this.playlistUrl = playlistUrl; this.playlistUrl = playlistUrl;
this.isMasterTimestampSource = isMasterTimestampSource; this.isMasterTimestampSource = isMasterTimestampSource;
@ -274,10 +269,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
this.extractorFactory = extractorFactory; this.extractorFactory = extractorFactory;
this.muxedCaptionFormats = muxedCaptionFormats; this.muxedCaptionFormats = muxedCaptionFormats;
this.drmInitData = drmInitData; this.drmInitData = drmInitData;
// Workaround for https://github.com/typetools/checker-framework/issues/2215
if (previousExtractor != null) {
this.previousExtractor = previousExtractor; this.previousExtractor = previousExtractor;
}
this.id3Decoder = id3Decoder; this.id3Decoder = id3Decoder;
this.scratchId3Data = scratchId3Data; this.scratchId3Data = scratchId3Data;
this.shouldSpliceIn = shouldSpliceIn; this.shouldSpliceIn = shouldSpliceIn;