loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import correct nullable annotation

Browse Source 
PiperOrigin-RevId: 668521379
This commit is contained in:
kimvde 2024-08-28 10:51:47 -07:00 committed by Copybara-Service
parent 5c2dc7ed4e
commit 8367e420ad
9 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java
View File

@ -21,6 +21,7 @@ import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.opengl.Matrix; import android.opengl.Matrix;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.VideoFrameProcessingException;
import androidx.media3.common.util.BitmapLoader; import androidx.media3.common.util.BitmapLoader;
@ -31,7 +32,6 @@ import androidx.media3.datasource.DataSourceBitmapLoader;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* Creates {@link TextureOverlay}s from {@link Bitmap}s. * Creates {@link TextureOverlay}s from {@link Bitmap}s.
@ -45,7 +45,7 @@ public abstract class BitmapOverlay extends TextureOverlay {
private int lastTextureId; private int lastTextureId;
private int lastBitmapGenerationId; private int lastBitmapGenerationId;
private @Nullable Bitmap lastBitmap; @Nullable private Bitmap lastBitmap;
public BitmapOverlay() { public BitmapOverlay() {
float[] temp = GlUtil.create4x4IdentityMatrix(); float[] temp = GlUtil.create4x4IdentityMatrix();

2
libraries/effect/src/main/java/androidx/media3/effect/BitmapTextureManager.java
View File

@ -24,6 +24,7 @@ import static androidx.media3.effect.DebugTraceUtil.EVENT_QUEUE_BITMAP;
import static androidx.media3.effect.DebugTraceUtil.EVENT_SIGNAL_EOS; import static androidx.media3.effect.DebugTraceUtil.EVENT_SIGNAL_EOS;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.FrameInfo; import androidx.media3.common.FrameInfo;
import androidx.media3.common.GlObjectsProvider; import androidx.media3.common.GlObjectsProvider;
@ -35,7 +36,6 @@ import androidx.media3.common.util.Util;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* Forwards a video frame produced from a {@link Bitmap} to a {@link GlShaderProgram} for * Forwards a video frame produced from a {@link Bitmap} to a {@link GlShaderProgram} for

8
libraries/effect/src/main/java/androidx/media3/effect/InputSwitcher.java
View File

@ -29,6 +29,7 @@ import static androidx.media3.common.util.Util.contains;
import android.content.Context; import android.content.Context;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import androidx.media3.common.ColorInfo; import androidx.media3.common.ColorInfo;
import androidx.media3.common.FrameInfo; import androidx.media3.common.FrameInfo;
import androidx.media3.common.GlObjectsProvider; import androidx.media3.common.GlObjectsProvider;
@ -39,7 +40,6 @@ import androidx.media3.common.VideoFrameProcessor;
import androidx.media3.effect.DefaultVideoFrameProcessor.WorkingColorSpace; import androidx.media3.effect.DefaultVideoFrameProcessor.WorkingColorSpace;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* A switcher to switch between {@linkplain TextureManager texture managers} of different * A switcher to switch between {@linkplain TextureManager texture managers} of different
@ -269,11 +269,13 @@ import org.checkerframework.checker.nullness.qual.Nullable;
checkNotNull(samplingGlShaderProgram).setOutputListener(gatedChainingListenerWrapper); checkNotNull(samplingGlShaderProgram).setOutputListener(gatedChainingListenerWrapper);
} }
public @Nullable ExternalShaderProgram getSamplingGlShaderProgram() { @Nullable
public ExternalShaderProgram getSamplingGlShaderProgram() {
return samplingGlShaderProgram; return samplingGlShaderProgram;
} }
public @Nullable ColorInfo getInputColorInfo() { @Nullable
public ColorInfo getInputColorInfo() {
return inputColorInfo; return inputColorInfo;
} }

18
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/ImageRenderer.java
View File

@ -28,6 +28,7 @@ import static java.lang.annotation.ElementType.TYPE_USE;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.SystemClock; import android.os.SystemClock;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.PlaybackException; import androidx.media3.common.PlaybackException;
@ -48,7 +49,6 @@ import java.lang.annotation.Target;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/** A {@link Renderer} implementation for images. */ /** A {@link Renderer} implementation for images. */
@ -108,14 +108,14 @@ public class ImageRenderer extends BaseRenderer {
private long largestQueuedPresentationTimeUs; private long largestQueuedPresentationTimeUs;
private @ReinitializationState int decoderReinitializationState; private @ReinitializationState int decoderReinitializationState;
private @C.FirstFrameState int firstFrameState; private @C.FirstFrameState int firstFrameState;
private @Nullable Format inputFormat; @Nullable private Format inputFormat;
private @Nullable ImageDecoder decoder; @Nullable private ImageDecoder decoder;
private @Nullable DecoderInputBuffer inputBuffer; @Nullable private DecoderInputBuffer inputBuffer;
private ImageOutput imageOutput; private ImageOutput imageOutput;
private @Nullable Bitmap outputBitmap; @Nullable private Bitmap outputBitmap;
private boolean readyToOutputTiles; private boolean readyToOutputTiles;
private @Nullable TileInfo tileInfo; @Nullable private TileInfo tileInfo;
private @Nullable TileInfo nextTileInfo; @Nullable private TileInfo nextTileInfo;
private int currentTileIndex; private int currentTileIndex;
/** /**
@ -274,8 +274,8 @@ public class ImageRenderer extends BaseRenderer {
throws ExoPlaybackException { throws ExoPlaybackException {
switch (messageType) { switch (messageType) {
case MSG_SET_IMAGE_OUTPUT: case MSG_SET_IMAGE_OUTPUT:
@Nullable ImageOutput imageOutput = @Nullable
message instanceof ImageOutput ? (ImageOutput) message : null; ImageOutput imageOutput = message instanceof ImageOutput ? (ImageOutput) message : null;
setImageOutput(imageOutput); setImageOutput(imageOutput);
break; break;
default: default:

5
libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpPayloadReader.java
View File

@ -16,12 +16,12 @@
package androidx.media3.exoplayer.rtsp.reader; package androidx.media3.exoplayer.rtsp.reader;
import androidx.annotation.Nullable;
import androidx.media3.common.ParserException; import androidx.media3.common.ParserException;
import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.ParsableByteArray;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.exoplayer.rtsp.RtpPayloadFormat; import androidx.media3.exoplayer.rtsp.RtpPayloadFormat;
import androidx.media3.extractor.ExtractorOutput; import androidx.media3.extractor.ExtractorOutput;
import org.checkerframework.checker.nullness.qual.Nullable;
/** Extracts media samples from the payload of received RTP packets. */ /** Extracts media samples from the payload of received RTP packets. */
@UnstableApi @UnstableApi
@ -37,7 +37,8 @@ public interface RtpPayloadReader {
* @return A {@link RtpPayloadReader} for the packet stream, or {@code null} if the stream * @return A {@link RtpPayloadReader} for the packet stream, or {@code null} if the stream
* format is not supported. * format is not supported.
*/ */
@Nullable RtpPayloadReader createPayloadReader(RtpPayloadFormat payloadFormat); @Nullable
RtpPayloadReader createPayloadReader(RtpPayloadFormat payloadFormat);
} }
/** /**

4
libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java
View File

@ -40,6 +40,7 @@ import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.text.style.TypefaceSpan; import android.text.style.TypefaceSpan;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.ColorInfo; import androidx.media3.common.ColorInfo;
import androidx.media3.common.Effect; import androidx.media3.common.Effect;
@ -74,7 +75,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@ -645,7 +645,7 @@ public final class DefaultVideoCompositorPixelTest {
private final LinkedHashMap<Long, Bitmap> outputTimestampsToBitmaps; private final LinkedHashMap<Long, Bitmap> outputTimestampsToBitmaps;
private final List<VideoFrameProcessorTestRunner> inputVideoFrameProcessorTestRunners; private final List<VideoFrameProcessorTestRunner> inputVideoFrameProcessorTestRunners;
private final VideoCompositor videoCompositor; private final VideoCompositor videoCompositor;
private final @Nullable ExecutorService sharedExecutorService; @Nullable private final ExecutorService sharedExecutorService;
private final AtomicReference<VideoFrameProcessingException> compositionException; private final AtomicReference<VideoFrameProcessingException> compositionException;
private final CountDownLatch compositorEnded; private final CountDownLatch compositorEnded;
private final String testId; private final String testId;

2
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java
View File

@ -33,6 +33,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.MediaItem; import androidx.media3.common.MediaItem;
@ -51,7 +52,6 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.junit.AssumptionViolatedException; import org.junit.AssumptionViolatedException;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;

8
libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java
View File

@ -16,6 +16,7 @@
package androidx.media3.transformer; package androidx.media3.transformer;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.Metadata; import androidx.media3.common.Metadata;
@ -33,7 +34,6 @@ import java.io.FileOutputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import org.checkerframework.checker.nullness.qual.Nullable;
/** {@link Muxer} implementation that uses an {@link Mp4Muxer} or {@link FragmentedMp4Muxer}. */ /** {@link Muxer} implementation that uses an {@link Mp4Muxer} or {@link FragmentedMp4Muxer}. */
@UnstableApi @UnstableApi
@ -59,7 +59,7 @@ public final class InAppMuxer implements Muxer {
/** A builder for {@link Factory} instances. */ /** A builder for {@link Factory} instances. */
public static final class Builder { public static final class Builder {
private @Nullable MetadataProvider metadataProvider; @Nullable private MetadataProvider metadataProvider;
private boolean outputFragmentedMp4; private boolean outputFragmentedMp4;
private long fragmentDurationMs; private long fragmentDurationMs;
@ -123,7 +123,7 @@ public final class InAppMuxer implements Muxer {
MimeTypes.AUDIO_OPUS, MimeTypes.AUDIO_OPUS,
MimeTypes.AUDIO_VORBIS); MimeTypes.AUDIO_VORBIS);
private final @Nullable MetadataProvider metadataProvider; @Nullable private final MetadataProvider metadataProvider;
private final boolean outputFragmentedMp4; private final boolean outputFragmentedMp4;
private final long fragmentDurationMs; private final long fragmentDurationMs;
@ -168,7 +168,7 @@ public final class InAppMuxer implements Muxer {
} }
private final androidx.media3.muxer.Muxer muxer; private final androidx.media3.muxer.Muxer muxer;
private final @Nullable MetadataProvider metadataProvider; @Nullable private final MetadataProvider metadataProvider;
private final Set<Metadata.Entry> metadataEntries; private final Set<Metadata.Entry> metadataEntries;
private InAppMuxer( private InAppMuxer(

6
libraries/transformer/src/main/java/androidx/media3/transformer/Mp4Info.java
View File

@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkState;
import static java.lang.Math.min; import static java.lang.Math.min;
import android.content.Context; import android.content.Context;
import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.DataReader; import androidx.media3.common.DataReader;
import androidx.media3.common.Format; import androidx.media3.common.Format;
@ -40,7 +41,6 @@ import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* Provides some specific MP4 metadata about an mp4 file such as the duration, last sync sample * Provides some specific MP4 metadata about an mp4 file such as the duration, last sync sample
@ -70,10 +70,10 @@ import org.checkerframework.checker.nullness.qual.Nullable;
public final boolean isFirstVideoSampleAfterTimeUsSyncSample; public final boolean isFirstVideoSampleAfterTimeUsSyncSample;
/** The video {@link Format} or {@code null} if there is no video track. */ /** The video {@link Format} or {@code null} if there is no video track. */
public final @Nullable Format videoFormat; @Nullable public final Format videoFormat;
/** The audio {@link Format} or {@code null} if there is no audio track. */ /** The audio {@link Format} or {@code null} if there is no audio track. */
public final @Nullable Format audioFormat; @Nullable public final Format audioFormat;
private Mp4Info( private Mp4Info(
long durationUs, long durationUs,