From 302a742c944b002379759ed05f121aaeab8af396 Mon Sep 17 00:00:00 2001 From: leonwind Date: Tue, 26 Jul 2022 23:10:33 +0000 Subject: [PATCH] Rename ContrastProcessorPixelTest and make contexts final PiperOrigin-RevId: 463450395 --- ...{ContrastProcessorPixelTest.java => ContrastPixelTest.java} | 2 +- .../java/androidx/media3/transformer/CropPixelTest.java | 3 ++- .../transformer/MatrixTransformationProcessorPixelTest.java | 1 + .../androidx/media3/transformer/PresentationPixelTest.java | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) rename libraries/transformer/src/androidTest/java/androidx/media3/transformer/{ContrastProcessorPixelTest.java => ContrastPixelTest.java} (99%) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastProcessorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java similarity index 99% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastProcessorPixelTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java index 1c9bc56aff..2e9f030ea9 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastProcessorPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java @@ -45,7 +45,7 @@ import org.junit.runner.RunWith; * as recommended in {@link GlEffectsFrameProcessorPixelTest}. */ @RunWith(AndroidJUnit4.class) -public class ContrastProcessorPixelTest { +public class ContrastPixelTest { private static final String EXOPLAYER_LOGO_PNG_ASSET_PATH = "media/bitmap/exoplayer_logo/original.png"; // TODO(b/239005261): Migrate png to an emulator generated picture. diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java index 4a1293fa3f..877d51048d 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java @@ -52,7 +52,8 @@ public final class CropPixelTest { public static final String CROP_LARGER_PNG_ASSET_PATH = "media/bitmap/sample_mp4_first_frame/crop_larger.png"; - private Context context = getApplicationContext(); + private final Context context = getApplicationContext(); + private @MonotonicNonNull EGLDisplay eglDisplay; private @MonotonicNonNull EGLContext eglContext; private @MonotonicNonNull SingleFrameGlTextureProcessor cropTextureProcessor; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java index 86f7c09729..ee8c8422b5 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java @@ -54,6 +54,7 @@ public final class MatrixTransformationProcessorPixelTest { "media/bitmap/sample_mp4_first_frame/rotate90.png"; private final Context context = getApplicationContext(); + private @MonotonicNonNull EGLDisplay eglDisplay; private @MonotonicNonNull EGLContext eglContext; private @MonotonicNonNull SingleFrameGlTextureProcessor matrixTransformationFrameProcessor; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java index d6d6bce3e1..4bf09061e1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java @@ -61,7 +61,8 @@ public final class PresentationPixelTest { public static final String ASPECT_RATIO_STRETCH_TO_FIT_WIDE_PNG_ASSET_PATH = "media/bitmap/sample_mp4_first_frame/aspect_ratio_stretch_to_fit_wide.png"; - private Context context = getApplicationContext(); + private final Context context = getApplicationContext(); + private @MonotonicNonNull EGLDisplay eglDisplay; private @MonotonicNonNull EGLContext eglContext; private @MonotonicNonNull SingleFrameGlTextureProcessor presentationTextureProcessor;