Commit cc337a3e by olly Committed by Toni

Update nullness annotations.

PiperOrigin-RevId: 252127811
parent 3bff79f5
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.source.chunk; package com.google.android.exoplayer2.source.chunk;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
...@@ -58,7 +59,7 @@ public abstract class BaseMediaChunk extends MediaChunk { ...@@ -58,7 +59,7 @@ public abstract class BaseMediaChunk extends MediaChunk {
DataSpec dataSpec, DataSpec dataSpec,
Format trackFormat, Format trackFormat,
int trackSelectionReason, int trackSelectionReason,
Object trackSelectionData, @Nullable Object trackSelectionData,
long startTimeUs, long startTimeUs,
long endTimeUs, long endTimeUs,
long clippedStartTimeUs, long clippedStartTimeUs,
......
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
*/ */
package com.google.android.exoplayer2.source.chunk; package com.google.android.exoplayer2.source.chunk;
import androidx.annotation.Nullable;
/** /**
* Holds a chunk or an indication that the end of the stream has been reached. * Holds a chunk or an indication that the end of the stream has been reached.
*/ */
public final class ChunkHolder { public final class ChunkHolder {
/** /** The chunk. */
* The chunk. @Nullable public Chunk chunk;
*/
public Chunk chunk;
/** /**
* Indicates that the end of the stream has been reached. * Indicates that the end of the stream has been reached.
......
...@@ -60,8 +60,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -60,8 +60,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
public final int primaryTrackType; public final int primaryTrackType;
private final int[] embeddedTrackTypes; @Nullable private final int[] embeddedTrackTypes;
private final Format[] embeddedTrackFormats; @Nullable private final Format[] embeddedTrackFormats;
private final boolean[] embeddedTracksSelected; private final boolean[] embeddedTracksSelected;
private final T chunkSource; private final T chunkSource;
private final SequenceableLoader.Callback<ChunkSampleStream<T>> callback; private final SequenceableLoader.Callback<ChunkSampleStream<T>> callback;
...@@ -104,8 +104,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -104,8 +104,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
@Deprecated @Deprecated
public ChunkSampleStream( public ChunkSampleStream(
int primaryTrackType, int primaryTrackType,
int[] embeddedTrackTypes, @Nullable int[] embeddedTrackTypes,
Format[] embeddedTrackFormats, @Nullable Format[] embeddedTrackFormats,
T chunkSource, T chunkSource,
Callback<ChunkSampleStream<T>> callback, Callback<ChunkSampleStream<T>> callback,
Allocator allocator, Allocator allocator,
...@@ -140,8 +140,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -140,8 +140,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
*/ */
public ChunkSampleStream( public ChunkSampleStream(
int primaryTrackType, int primaryTrackType,
int[] embeddedTrackTypes, @Nullable int[] embeddedTrackTypes,
Format[] embeddedTrackFormats, @Nullable Format[] embeddedTrackFormats,
T chunkSource, T chunkSource,
Callback<ChunkSampleStream<T>> callback, Callback<ChunkSampleStream<T>> callback,
Allocator allocator, Allocator allocator,
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.source.chunk; package com.google.android.exoplayer2.source.chunk;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
...@@ -44,7 +45,7 @@ public abstract class MediaChunk extends Chunk { ...@@ -44,7 +45,7 @@ public abstract class MediaChunk extends Chunk {
DataSpec dataSpec, DataSpec dataSpec,
Format trackFormat, Format trackFormat,
int trackSelectionReason, int trackSelectionReason,
Object trackSelectionData, @Nullable Object trackSelectionData,
long startTimeUs, long startTimeUs,
long endTimeUs, long endTimeUs,
long chunkIndex) { long chunkIndex) {
......
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