diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameRenderingTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameRenderingTest.java index 56a11a590f..fea005d1d2 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameRenderingTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameRenderingTest.java @@ -45,7 +45,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.junit.After; import org.junit.Test; @@ -274,7 +273,6 @@ public final class DefaultVideoFrameProcessorVideoFrameRenderingTest { void onFrameAvailableForRendering(long presentationTimeUs); } - @EnsuresNonNull("defaultVideoFrameProcessor") private void processFramesToEndOfStream( List inputPresentationTimesUs, OnOutputFrameAvailableForRenderingListener onFrameAvailableListener, diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java index e0f87f9d9d..7faf564025 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java @@ -30,9 +30,7 @@ import androidx.media3.common.util.Consumer; import androidx.media3.test.utils.TextureBitmapReader; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -49,7 +47,6 @@ public class FrameDropTest { private @MonotonicNonNull TextureBitmapReader textureBitmapReader; private String testId; - @EnsuresNonNull({"textureBitmapReader"}) @Before public void setUp() { textureBitmapReader = new TextureBitmapReader(); @@ -57,7 +54,6 @@ public class FrameDropTest { } @Test - @RequiresNonNull({"textureBitmapReader"}) public void frameDrop_withDefaultStrategy_outputsFramesAtTheCorrectPresentationTimesUs() throws Exception { ImmutableList frameTimesUs = @@ -73,7 +69,6 @@ public class FrameDropTest { } @Test - @RequiresNonNull({"textureBitmapReader"}) public void frameDrop_withSimpleStrategy_outputsFramesAtTheCorrectPresentationTimesUs() throws Exception { ImmutableList frameTimesUs = @@ -90,7 +85,6 @@ public class FrameDropTest { } @Test - @RequiresNonNull({"textureBitmapReader"}) public void frameDrop_withSimpleStrategy_outputsAllFrames() throws Exception { ImmutableList frameTimesUs = ImmutableList.of(0L, 333_333L, 666_667L); FrameDropEffect frameDropEffect = diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java index 0c0aaf7eed..1bc0bba153 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java @@ -30,9 +30,7 @@ import androidx.media3.common.util.Consumer; import androidx.media3.test.utils.TextureBitmapReader; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -74,7 +72,6 @@ public class GaussianBlurTest { private String testId; private @MonotonicNonNull TextureBitmapReader textureBitmapReader; - @EnsuresNonNull({"textureBitmapReader"}) @Before public void setUp() { textureBitmapReader = new TextureBitmapReader(); @@ -85,7 +82,6 @@ public class GaussianBlurTest { // different text rendering implementation that leads to a larger pixel difference. @Test - @RequiresNonNull({"textureBitmapReader"}) public void gaussianBlur_blursFrame() throws Exception { ImmutableList frameTimesUs = ImmutableList.of(22_000L); ImmutableList actualPresentationTimesUs = diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java index cd4c252cd3..9c0557f32c 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java @@ -32,9 +32,7 @@ import androidx.media3.common.util.Consumer; import androidx.media3.test.utils.TextureBitmapReader; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -77,7 +75,6 @@ public class GaussianBlurWithFrameOverlaidTest { private String testId; private @MonotonicNonNull TextureBitmapReader textureBitmapReader; - @EnsuresNonNull({"textureBitmapReader"}) @Before public void setUp() { textureBitmapReader = new TextureBitmapReader(); @@ -88,7 +85,6 @@ public class GaussianBlurWithFrameOverlaidTest { // different text rendering implementation that leads to a larger pixel difference. @Test - @RequiresNonNull({"textureBitmapReader"}) public void gaussianBlurWithFrameOverlaid_blursFrameAndOverlaysSharpImage() throws Exception { ImmutableList frameTimesUs = ImmutableList.of(32_000L); ImmutableList actualPresentationTimesUs = @@ -106,7 +102,6 @@ public class GaussianBlurWithFrameOverlaidTest { } @Test - @RequiresNonNull({"textureBitmapReader"}) public void gaussianBlurWithFrameOverlaid_sigmaChangesWithTime_differentFramesHaveDifferentBlurs() throws Exception { ImmutableList frameTimesUs = ImmutableList.of(32_000L, 71_000L); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/TimestampAdjustmentTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/TimestampAdjustmentTest.java index f548c9ae0e..d15075fb4b 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/TimestampAdjustmentTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/TimestampAdjustmentTest.java @@ -30,9 +30,7 @@ import androidx.media3.common.util.Consumer; import androidx.media3.test.utils.TextureBitmapReader; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -49,7 +47,6 @@ public class TimestampAdjustmentTest { private @MonotonicNonNull TextureBitmapReader textureBitmapReader; private String testId; - @EnsuresNonNull({"textureBitmapReader"}) @Before public void setUp() { textureBitmapReader = new TextureBitmapReader(); @@ -57,7 +54,6 @@ public class TimestampAdjustmentTest { } @Test - @RequiresNonNull({"textureBitmapReader"}) public void timestampAdjustmentTest_outputsFramesAtTheCorrectPresentationTimesUs() throws Exception { ImmutableList frameTimesUs = ImmutableList.of(0L, 32_000L, 71_000L);