Move @MonotonicNonNull annotations to their correct positions

PiperOrigin-RevId: 289823804

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java

@@ -37,7 +37,7 @@ public final class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
 
 
   private static final int NUM_BUFFERS = 16;
   private static final int NUM_BUFFERS = 16;
 
 
-  @MonotonicNonNull private FlacStreamMetadata streamMetadata;
+  private @MonotonicNonNull FlacStreamMetadata streamMetadata;
 
 
   public LibflacAudioRenderer() {
   public LibflacAudioRenderer() {
     this(/* eventHandler= */ null, /* eventListener= */ null);
     this(/* eventHandler= */ null, /* eventListener= */ null);

library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java

@@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  */
  */
 public abstract class NoSampleRenderer implements Renderer, RendererCapabilities {
 public abstract class NoSampleRenderer implements Renderer, RendererCapabilities {
 
 
-  @MonotonicNonNull private RendererConfiguration configuration;
+  private @MonotonicNonNull RendererConfiguration configuration;
   private int index;
   private int index;
   private int state;
   private int state;
   @Nullable private SampleStream stream;
   @Nullable private SampleStream stream;

library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java

@@ -141,9 +141,9 @@ public final class AmrExtractor implements Extractor {
   private int numSamplesWithSameSize;
   private int numSamplesWithSameSize;
   private long timeOffsetUs;
   private long timeOffsetUs;
 
 
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
-  @MonotonicNonNull private TrackOutput trackOutput;
-  @MonotonicNonNull private SeekMap seekMap;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
+  private @MonotonicNonNull TrackOutput trackOutput;
+  private @MonotonicNonNull SeekMap seekMap;
   private boolean hasOutputFormat;
   private boolean hasOutputFormat;
 
 
   public AmrExtractor() {
   public AmrExtractor() {

library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java

@@ -101,15 +101,15 @@ public final class FlacExtractor implements Extractor {
 
 
   private final SampleNumberHolder sampleNumberHolder;
   private final SampleNumberHolder sampleNumberHolder;
 
 
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
-  @MonotonicNonNull private TrackOutput trackOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
+  private @MonotonicNonNull TrackOutput trackOutput;
 
 
   private @State int state;
   private @State int state;
   @Nullable private Metadata id3Metadata;
   @Nullable private Metadata id3Metadata;
-  @MonotonicNonNull private FlacStreamMetadata flacStreamMetadata;
+  private @MonotonicNonNull FlacStreamMetadata flacStreamMetadata;
   private int minFrameSize;
   private int minFrameSize;
   private int frameStartMarker;
   private int frameStartMarker;
-  @MonotonicNonNull private FlacBinarySearchSeeker binarySearchSeeker;
+  private @MonotonicNonNull FlacBinarySearchSeeker binarySearchSeeker;
   private int currentFrameBytesWritten;
   private int currentFrameBytesWritten;
   private long currentFrameFirstSampleNumber;
   private long currentFrameFirstSampleNumber;
 
 

library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java

@@ -74,7 +74,7 @@ public final class FlvExtractor implements Extractor {
   private final ParsableByteArray tagData;
   private final ParsableByteArray tagData;
   private final ScriptTagPayloadReader metadataReader;
   private final ScriptTagPayloadReader metadataReader;
 
 
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
   private @States int state;
   private @States int state;
   private boolean outputFirstSample;
   private boolean outputFirstSample;
   private long mediaTagTimestampOffsetUs;
   private long mediaTagTimestampOffsetUs;
@@ -83,8 +83,8 @@ public final class FlvExtractor implements Extractor {
   private int tagDataSize;
   private int tagDataSize;
   private long tagTimestampUs;
   private long tagTimestampUs;
   private boolean outputSeekMap;
   private boolean outputSeekMap;
-  @MonotonicNonNull private AudioTagPayloadReader audioReader;
-  @MonotonicNonNull private VideoTagPayloadReader videoReader;
+  private @MonotonicNonNull AudioTagPayloadReader audioReader;
+  private @MonotonicNonNull VideoTagPayloadReader videoReader;
 
 
   public FlvExtractor() {
   public FlvExtractor() {
     scratch = new ParsableByteArray(4);
     scratch = new ParsableByteArray(4);

library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java

@@ -55,7 +55,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   private final ArrayDeque<MasterElement> masterElementsStack;
   private final ArrayDeque<MasterElement> masterElementsStack;
   private final VarintReader varintReader;
   private final VarintReader varintReader;
 
 
-  @MonotonicNonNull private EbmlProcessor processor;
+  private @MonotonicNonNull EbmlProcessor processor;
   private @ElementState int elementState;
   private @ElementState int elementState;
   private int elementId;
   private int elementId;
   private long elementContentSize;
   private long elementContentSize;

library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java

@@ -390,7 +390,7 @@ public class MatroskaExtractor implements Extractor {
   private boolean sampleInitializationVectorRead;
   private boolean sampleInitializationVectorRead;
 
 
   // Extractor outputs.
   // Extractor outputs.
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
 
 
   public MatroskaExtractor() {
   public MatroskaExtractor() {
     this(0);
     this(0);

library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java

@@ -112,13 +112,13 @@ public final class Mp3Extractor implements Extractor {
   private final Id3Peeker id3Peeker;
   private final Id3Peeker id3Peeker;
 
 
   // Extractor outputs.
   // Extractor outputs.
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
-  @MonotonicNonNull private TrackOutput trackOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
+  private @MonotonicNonNull TrackOutput trackOutput;
 
 
   private int synchronizedHeaderData;
   private int synchronizedHeaderData;
 
 
   @Nullable private Metadata metadata;
   @Nullable private Metadata metadata;
-  @MonotonicNonNull private Seeker seeker;
+  private @MonotonicNonNull Seeker seeker;
   private boolean disableSeeking;
   private boolean disableSeeking;
   private long basisTimeUs;
   private long basisTimeUs;
   private long samplesRead;
   private long samplesRead;

library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java

@@ -170,7 +170,7 @@ public class FragmentedMp4Extractor implements Extractor {
   private boolean processSeiNalUnitPayload;
   private boolean processSeiNalUnitPayload;
 
 
   // Extractor output.
   // Extractor output.
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
   private TrackOutput[] emsgTrackOutputs;
   private TrackOutput[] emsgTrackOutputs;
   private TrackOutput[] cea608TrackOutputs;
   private TrackOutput[] cea608TrackOutputs;
 
 

library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java

@@ -115,7 +115,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
   private int sampleCurrentNalBytesRemaining;
   private int sampleCurrentNalBytesRemaining;
 
 
   // Extractor outputs.
   // Extractor outputs.
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
   private Mp4Track[] tracks;
   private Mp4Track[] tracks;
   private long[][] accumulatedSampleSizes;
   private long[][] accumulatedSampleSizes;
   private int firstVideoTrackIndex;
   private int firstVideoTrackIndex;

library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java

@@ -27,7 +27,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 /* package */ final class TrackFragment {
 /* package */ final class TrackFragment {
 
 
   /** The default values for samples from the track fragment header. */
   /** The default values for samples from the track fragment header. */
-  @MonotonicNonNull public DefaultSampleValues header;
+  public @MonotonicNonNull DefaultSampleValues header;
   /**
   /**
    * The position (byte offset) of the start of fragment.
    * The position (byte offset) of the start of fragment.
    */
    */

library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java

@@ -39,8 +39,8 @@ public class OggExtractor implements Extractor {
 
 
   private static final int MAX_VERIFICATION_BYTES = 8;
   private static final int MAX_VERIFICATION_BYTES = 8;
 
 
-  @MonotonicNonNull private ExtractorOutput output;
-  @MonotonicNonNull private StreamReader streamReader;
+  private @MonotonicNonNull ExtractorOutput output;
+  private @MonotonicNonNull StreamReader streamReader;
   private boolean streamReaderInitialized;
   private boolean streamReaderInitialized;
 
 
   @Override
   @Override

library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java

@@ -45,9 +45,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 
   private final OggPacket oggPacket;
   private final OggPacket oggPacket;
 
 
-  @MonotonicNonNull private TrackOutput trackOutput;
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
-  @MonotonicNonNull private OggSeeker oggSeeker;
+  private @MonotonicNonNull TrackOutput trackOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
+  private @MonotonicNonNull OggSeeker oggSeeker;
   private long targetGranule;
   private long targetGranule;
   private long payloadStartPosition;
   private long payloadStartPosition;
   private long currentGranule;
   private long currentGranule;

library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java

@@ -49,7 +49,7 @@ public final class RawCcExtractor implements Extractor {
   private final Format format;
   private final Format format;
   private final ParsableByteArray dataScratch;
   private final ParsableByteArray dataScratch;
 
 
-  @MonotonicNonNull private TrackOutput trackOutput;
+  private @MonotonicNonNull TrackOutput trackOutput;
   private int parserState;
   private int parserState;
   private int version;
   private int version;
   private long timestampUs;
   private long timestampUs;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java

@@ -54,8 +54,8 @@ public final class Ac3Reader implements ElementaryStreamReader {
   private final ParsableByteArray headerScratchBytes;
   private final ParsableByteArray headerScratchBytes;
   @Nullable private final String language;
   @Nullable private final String language;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
 
 
   @State private int state;
   @State private int state;
   private int bytesRead;
   private int bytesRead;
@@ -65,7 +65,7 @@ public final class Ac3Reader implements ElementaryStreamReader {
 
 
   // Used when parsing the header.
   // Used when parsing the header.
   private long sampleDurationUs;
   private long sampleDurationUs;
-  @MonotonicNonNull private Format format;
+  private @MonotonicNonNull Format format;
   private int sampleSize;
   private int sampleSize;
 
 
   // Used when reading the samples.
   // Used when reading the samples.

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java

@@ -50,8 +50,8 @@ public final class Ac4Reader implements ElementaryStreamReader {
   private final ParsableByteArray headerScratchBytes;
   private final ParsableByteArray headerScratchBytes;
   @Nullable private final String language;
   @Nullable private final String language;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
 
 
   @State private int state;
   @State private int state;
   private int bytesRead;
   private int bytesRead;
@@ -62,7 +62,7 @@ public final class Ac4Reader implements ElementaryStreamReader {
 
 
   // Used when parsing the header.
   // Used when parsing the header.
   private long sampleDurationUs;
   private long sampleDurationUs;
-  @MonotonicNonNull private Format format;
+  private @MonotonicNonNull Format format;
   private int sampleSize;
   private int sampleSize;
 
 
   // Used when reading the samples.
   // Used when reading the samples.

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java

@@ -87,7 +87,7 @@ public final class AdtsExtractor implements Extractor {
   private final ParsableByteArray scratch;
   private final ParsableByteArray scratch;
   private final ParsableBitArray scratchBits;
   private final ParsableBitArray scratchBits;
 
 
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
 
 
   private long firstSampleTimestampUs;
   private long firstSampleTimestampUs;
   private long firstFramePosition;
   private long firstFramePosition;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java

@@ -70,9 +70,9 @@ public final class AdtsReader implements ElementaryStreamReader {
   private final ParsableByteArray id3HeaderBuffer;
   private final ParsableByteArray id3HeaderBuffer;
   @Nullable private final String language;
   @Nullable private final String language;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
-  @MonotonicNonNull private TrackOutput id3Output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
+  private @MonotonicNonNull TrackOutput id3Output;
 
 
   private int state;
   private int state;
   private int bytesRead;
   private int bytesRead;
@@ -96,7 +96,7 @@ public final class AdtsReader implements ElementaryStreamReader {
   // Used when reading the samples.
   // Used when reading the samples.
   private long timeUs;
   private long timeUs;
 
 
-  @MonotonicNonNull private TrackOutput currentOutput;
+  private @MonotonicNonNull TrackOutput currentOutput;
   private long currentSampleDuration;
   private long currentSampleDuration;
 
 
   /**
   /**

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java

@@ -41,8 +41,8 @@ public final class DtsReader implements ElementaryStreamReader {
   private final ParsableByteArray headerScratchBytes;
   private final ParsableByteArray headerScratchBytes;
   @Nullable private final String language;
   @Nullable private final String language;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
 
 
   private int state;
   private int state;
   private int bytesRead;
   private int bytesRead;
@@ -52,7 +52,7 @@ public final class DtsReader implements ElementaryStreamReader {
 
 
   // Used when parsing the header.
   // Used when parsing the header.
   private long sampleDurationUs;
   private long sampleDurationUs;
-  @MonotonicNonNull private Format format;
+  private @MonotonicNonNull Format format;
   private int sampleSize;
   private int sampleSize;
 
 
   // Used when reading the samples.
   // Used when reading the samples.

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java

@@ -42,8 +42,8 @@ public final class H262Reader implements ElementaryStreamReader {
   private static final int START_GROUP = 0xB8;
   private static final int START_GROUP = 0xB8;
   private static final int START_USER_DATA = 0xB2;
   private static final int START_USER_DATA = 0xB2;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
 
 
   // Maps (frame_rate_code - 1) indices to values, as defined in ITU-T H.262 Table 6-4.
   // Maps (frame_rate_code - 1) indices to values, as defined in ITU-T H.262 Table 6-4.
   private static final double[] FRAME_RATE_VALUES = new double[] {
   private static final double[] FRAME_RATE_VALUES = new double[] {

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java

@@ -57,9 +57,9 @@ public final class H264Reader implements ElementaryStreamReader {
   private long totalBytesWritten;
   private long totalBytesWritten;
   private final boolean[] prefixFlags;
   private final boolean[] prefixFlags;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
-  @MonotonicNonNull private SampleReader sampleReader;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
+  private @MonotonicNonNull SampleReader sampleReader;
 
 
   // State that should not be reset on seek.
   // State that should not be reset on seek.
   private boolean hasOutputFormat;
   private boolean hasOutputFormat;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java

@@ -52,9 +52,9 @@ public final class H265Reader implements ElementaryStreamReader {
 
 
   private final SeiReader seiReader;
   private final SeiReader seiReader;
 
 
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private TrackOutput output;
-  @MonotonicNonNull private SampleReader sampleReader;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull TrackOutput output;
+  private @MonotonicNonNull SampleReader sampleReader;
 
 
   // State that should not be reset on seek.
   // State that should not be reset on seek.
   private boolean hasOutputFormat;
   private boolean hasOutputFormat;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java

@@ -38,7 +38,7 @@ public final class Id3Reader implements ElementaryStreamReader {
 
 
   private final ParsableByteArray id3Header;
   private final ParsableByteArray id3Header;
 
 
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull TrackOutput output;
 
 
   // State that should be reset on seek.
   // State that should be reset on seek.
   private boolean writingSample;
   private boolean writingSample;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java

@@ -51,9 +51,9 @@ public final class LatmReader implements ElementaryStreamReader {
   private final ParsableBitArray sampleBitArray;
   private final ParsableBitArray sampleBitArray;
 
 
   // Track output info.
   // Track output info.
-  @MonotonicNonNull private TrackOutput output;
-  @MonotonicNonNull private String formatId;
-  @MonotonicNonNull private Format format;
+  private @MonotonicNonNull TrackOutput output;
+  private @MonotonicNonNull String formatId;
+  private @MonotonicNonNull Format format;
 
 
   // Parser state info.
   // Parser state info.
   private int state;
   private int state;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java

@@ -42,8 +42,8 @@ public final class MpegAudioReader implements ElementaryStreamReader {
   private final MpegAudioHeader header;
   private final MpegAudioHeader header;
   @Nullable private final String language;
   @Nullable private final String language;
 
 
-  @MonotonicNonNull private TrackOutput output;
-  @MonotonicNonNull private String formatId;
+  private @MonotonicNonNull TrackOutput output;
+  private @MonotonicNonNull String formatId;
 
 
   private int state;
   private int state;
   private int frameBytesRead;
   private int frameBytesRead;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java

@@ -49,7 +49,7 @@ public final class PesReader implements TsPayloadReader {
   private int state;
   private int state;
   private int bytesRead;
   private int bytesRead;
 
 
-  @MonotonicNonNull private TimestampAdjuster timestampAdjuster;
+  private @MonotonicNonNull TimestampAdjuster timestampAdjuster;
   private boolean ptsFlag;
   private boolean ptsFlag;
   private boolean dtsFlag;
   private boolean dtsFlag;
   private boolean seenFirstDts;
   private boolean seenFirstDts;

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java

@@ -72,7 +72,7 @@ public final class PsExtractor implements Extractor {
 
 
   // Accessed only by the loading thread.
   // Accessed only by the loading thread.
   @Nullable private PsBinarySearchSeeker psBinarySearchSeeker;
   @Nullable private PsBinarySearchSeeker psBinarySearchSeeker;
-  @MonotonicNonNull private ExtractorOutput output;
+  private @MonotonicNonNull ExtractorOutput output;
   private boolean hasOutputSeekMap;
   private boolean hasOutputSeekMap;
 
 
   public PsExtractor() {
   public PsExtractor() {

library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java

@@ -32,8 +32,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  */
  */
 public final class SpliceInfoSectionReader implements SectionPayloadReader {
 public final class SpliceInfoSectionReader implements SectionPayloadReader {
 
 
-  @MonotonicNonNull private TimestampAdjuster timestampAdjuster;
-  @MonotonicNonNull private TrackOutput output;
+  private @MonotonicNonNull TimestampAdjuster timestampAdjuster;
+  private @MonotonicNonNull TrackOutput output;
   private boolean formatDeclared;
   private boolean formatDeclared;
 
 
   @Override
   @Override

library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java

@@ -49,9 +49,9 @@ public final class WavExtractor implements Extractor {
   /** Factory for {@link WavExtractor} instances. */
   /** Factory for {@link WavExtractor} instances. */
   public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new WavExtractor()};
   public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new WavExtractor()};
 
 
-  @MonotonicNonNull private ExtractorOutput extractorOutput;
-  @MonotonicNonNull private TrackOutput trackOutput;
-  @MonotonicNonNull private OutputWriter outputWriter;
+  private @MonotonicNonNull ExtractorOutput extractorOutput;
+  private @MonotonicNonNull TrackOutput trackOutput;
+  private @MonotonicNonNull OutputWriter outputWriter;
   private int dataStartPosition;
   private int dataStartPosition;
   private long dataEndPosition;
   private long dataEndPosition;
 
 

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java

@@ -50,7 +50,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private final MediaCodecAsyncCallback mediaCodecAsyncCallback;
   private final MediaCodecAsyncCallback mediaCodecAsyncCallback;
   private final MediaCodec codec;
   private final MediaCodec codec;
   private final HandlerThread handlerThread;
   private final HandlerThread handlerThread;
-  @MonotonicNonNull private Handler handler;
+  private @MonotonicNonNull Handler handler;
   private long pendingFlushCount;
   private long pendingFlushCount;
   private @State int state;
   private @State int state;
   private Runnable codecStartRunnable;
   private Runnable codecStartRunnable;

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java

@@ -78,8 +78,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private final ArrayDeque<MediaFormat> formats;
   private final ArrayDeque<MediaFormat> formats;
 
 
   @GuardedBy("objectStateLock")
   @GuardedBy("objectStateLock")
-  @MonotonicNonNull
-  private MediaFormat currentFormat;
+  private @MonotonicNonNull MediaFormat currentFormat;
 
 
   @GuardedBy("objectStateLock")
   @GuardedBy("objectStateLock")
   private long pendingFlush;
   private long pendingFlush;
@@ -92,7 +91,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private @State int state;
   private @State int state;
 
 
   private final HandlerThread handlerThread;
   private final HandlerThread handlerThread;
-  @MonotonicNonNull private Handler handler;
+  private @MonotonicNonNull Handler handler;
   private Runnable codecStartRunnable;
   private Runnable codecStartRunnable;
 
 
   /** Creates a new instance that wraps the specified {@link MediaCodec}. */
   /** Creates a new instance that wraps the specified {@link MediaCodec}. */

library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java

@@ -40,7 +40,7 @@ public final class SpliceInfoDecoder implements MetadataDecoder {
   private final ParsableByteArray sectionData;
   private final ParsableByteArray sectionData;
   private final ParsableBitArray sectionHeader;
   private final ParsableBitArray sectionHeader;
 
 
-  @MonotonicNonNull private TimestampAdjuster timestampAdjuster;
+  private @MonotonicNonNull TimestampAdjuster timestampAdjuster;
 
 
   public SpliceInfoDecoder() {
   public SpliceInfoDecoder() {
     sectionData = new ParsableByteArray();
     sectionData = new ParsableByteArray();

library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java

@@ -179,7 +179,7 @@ public abstract class DownloadService extends Service {
   @StringRes private final int channelNameResourceId;
   @StringRes private final int channelNameResourceId;
   @StringRes private final int channelDescriptionResourceId;
   @StringRes private final int channelDescriptionResourceId;
 
 
-  @MonotonicNonNull private DownloadManager downloadManager;
+  private @MonotonicNonNull DownloadManager downloadManager;
   private int lastStartId;
   private int lastStartId;
   private boolean startedInForeground;
   private boolean startedInForeground;
   private boolean taskRemoved;
   private boolean taskRemoved;

library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java

@@ -87,7 +87,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private final ClutDefinition defaultClutDefinition;
   private final ClutDefinition defaultClutDefinition;
   private final SubtitleService subtitleService;
   private final SubtitleService subtitleService;
 
 
-  @MonotonicNonNull private Bitmap bitmap;
+  private @MonotonicNonNull Bitmap bitmap;
 
 
   /**
   /**
    * Construct an instance for the given subtitle and ancillary page ids.
    * Construct an instance for the given subtitle and ancillary page ids.

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java

@@ -57,7 +57,7 @@ public final class CacheDataSink implements DataSink {
   @Nullable private OutputStream outputStream;
   @Nullable private OutputStream outputStream;
   private long outputStreamBytesWritten;
   private long outputStreamBytesWritten;
   private long dataSpecBytesWritten;
   private long dataSpecBytesWritten;
-  @MonotonicNonNull private ReusableBufferedOutputStream bufferedOutputStream;
+  private @MonotonicNonNull ReusableBufferedOutputStream bufferedOutputStream;
 
 
   /**
   /**
    * Thrown when IOException is encountered when writing data into sink.
    * Thrown when IOException is encountered when writing data into sink.

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java

@@ -60,7 +60,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 
   private final DatabaseProvider databaseProvider;
   private final DatabaseProvider databaseProvider;
 
 
-  @MonotonicNonNull private String tableName;
+  private @MonotonicNonNull String tableName;
 
 
   /**
   /**
    * Deletes index data for the specified cache.
    * Deletes index data for the specified cache.

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

@@ -212,9 +212,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   private final boolean mediaSegmentEncrypted;
   private final boolean mediaSegmentEncrypted;
   private final boolean initSegmentEncrypted;
   private final boolean initSegmentEncrypted;
 
 
-  @MonotonicNonNull private Extractor extractor;
+  private @MonotonicNonNull Extractor extractor;
   private boolean isExtractorReusable;
   private boolean isExtractorReusable;
-  @MonotonicNonNull private HlsSampleStreamWrapper output;
+  private @MonotonicNonNull HlsSampleStreamWrapper output;
   // nextLoadPosition refers to the init segment if initDataLoadRequired is true.
   // nextLoadPosition refers to the init segment if initDataLoadRequired is true.
   // Otherwise, nextLoadPosition refers to the media segment.
   // Otherwise, nextLoadPosition refers to the media segment.
   private int nextLoadPosition;
   private int nextLoadPosition;

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -132,20 +132,20 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   private int[] sampleQueueTrackIds;
   private int[] sampleQueueTrackIds;
   private Set<Integer> sampleQueueMappingDoneByType;
   private Set<Integer> sampleQueueMappingDoneByType;
   private SparseIntArray sampleQueueIndicesByType;
   private SparseIntArray sampleQueueIndicesByType;
-  @MonotonicNonNull private TrackOutput emsgUnwrappingTrackOutput;
+  private @MonotonicNonNull TrackOutput emsgUnwrappingTrackOutput;
   private int primarySampleQueueType;
   private int primarySampleQueueType;
   private int primarySampleQueueIndex;
   private int primarySampleQueueIndex;
   private boolean sampleQueuesBuilt;
   private boolean sampleQueuesBuilt;
   private boolean prepared;
   private boolean prepared;
   private int enabledTrackGroupCount;
   private int enabledTrackGroupCount;
-  @MonotonicNonNull private Format upstreamTrackFormat;
+  private @MonotonicNonNull Format upstreamTrackFormat;
   @Nullable private Format downstreamTrackFormat;
   @Nullable private Format downstreamTrackFormat;
   private boolean released;
   private boolean released;
 
 
   // Tracks are complicated in HLS. See documentation of buildTracksFromSampleStreams for details.
   // Tracks are complicated in HLS. See documentation of buildTracksFromSampleStreams for details.
   // Indexed by track (as exposed by this source).
   // Indexed by track (as exposed by this source).
-  @MonotonicNonNull private TrackGroupArray trackGroups;
-  @MonotonicNonNull private Set<TrackGroup> optionalTrackGroups;
+  private @MonotonicNonNull TrackGroupArray trackGroups;
+  private @MonotonicNonNull Set<TrackGroup> optionalTrackGroups;
   // Indexed by track group.
   // Indexed by track group.
   private int @MonotonicNonNull [] trackGroupToSampleQueueIndex;
   private int @MonotonicNonNull [] trackGroupToSampleQueueIndex;
   private int primaryTrackGroupIndex;
   private int primaryTrackGroupIndex;
@@ -1358,7 +1358,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     private final EventMessageDecoder emsgDecoder;
     private final EventMessageDecoder emsgDecoder;
     private final TrackOutput delegate;
     private final TrackOutput delegate;
     private final Format delegateFormat;
     private final Format delegateFormat;
-    @MonotonicNonNull private Format format;
+    private @MonotonicNonNull Format format;
 
 
     private byte[] buffer;
     private byte[] buffer;
     private int bufferPosition;
     private int bufferPosition;

library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java

@@ -202,7 +202,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   private int keyCountIncrement;
   private int keyCountIncrement;
   private long keyTimeIncrement;
   private long keyTimeIncrement;
   private int lastCoarseScrubXPosition;
   private int lastCoarseScrubXPosition;
-  @MonotonicNonNull private Rect lastExclusionRectangle;
+  private @MonotonicNonNull Rect lastExclusionRectangle;
 
 
   private boolean scrubbing;
   private boolean scrubbing;
   private long scrubPosition;
   private long scrubPosition;