From 219212d54ff0b52ba356536fdef2c48a636284bb Mon Sep 17 00:00:00 2001 From: tofunmi Date: Mon, 12 Jun 2023 10:57:02 +0000 Subject: [PATCH] rename videoFrameProcessorTestRunner.queueInputBitmap This methods currently registers and queues the bitmaps Will need to have a method that just queues bitmaps in future CLs. #minor-release PiperOrigin-RevId: 539605628 --- ...ideoFrameProcessorImageFrameOutputTest.java | 18 +++++++++--------- .../DefaultVideoFrameProcessorPixelTest.java | 6 +++--- .../androidx/media3/effect/FrameDropTest.java | 8 ++++---- .../utils/VideoFrameProcessorTestRunner.java | 9 +++++---- ...rocessorMultipleTextureOutputPixelTest.java | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java index be659202aa..98204ed3e9 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java @@ -65,17 +65,17 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { String testId = "imageInput_queueThreeBitmaps_outputsCorrectNumberOfFrames"; videoFrameProcessorTestRunner = getDefaultFrameProcessorTestRunnerBuilder(testId).build(); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 2); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(SCALE_WIDE_PNG_ASSET_PATH), 2 * C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 3); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(BITMAP_OVERLAY_PNG_ASSET_PATH), 3 * C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, @@ -93,7 +93,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { videoFrameProcessorTestRunner = getDefaultFrameProcessorTestRunnerBuilder(testId).build(); for (int i = 0; i < 20; i++) { - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, @@ -118,7 +118,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { .build(); long offsetUs = 1_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs, @@ -141,13 +141,13 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { .build(); long offsetUs1 = 1_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs1, /* frameRate= */ 2); long offsetUs2 = 2_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(SCALE_WIDE_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs2, @@ -175,13 +175,13 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { .setOnOutputFrameAvailableForRenderingListener(actualPresentationTimesUs::add) .build(); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 2); videoFrameProcessorTestRunner.endFrameProcessing(); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ 2 * C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java index 32f4189be1..8bf35f19ca 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java @@ -164,7 +164,7 @@ public final class DefaultVideoFrameProcessorPixelTest { Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(IMAGE_TO_VIDEO_PNG_ASSET_PATH); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( originalBitmap, C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 1); videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); @@ -193,7 +193,7 @@ public final class DefaultVideoFrameProcessorPixelTest { Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(IMAGE_TO_CROPPED_VIDEO_PNG_ASSET_PATH); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( originalBitmap, C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 1); videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); @@ -220,7 +220,7 @@ public final class DefaultVideoFrameProcessorPixelTest { .build(); Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( originalBitmap, C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 1); videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); 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 3461587162..7a88e75505 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java @@ -74,7 +74,7 @@ public class FrameDropTest { ImmutableList timestampsMs = ImmutableList.of(0, 16, 32, 48, 58, 71, 86); for (int timestampMs : timestampsMs) { - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ timestampMs * 1000L, @@ -97,12 +97,12 @@ public class FrameDropTest { /* expectedFrameRate= */ 6, /* targetFrameRate= */ 2)) .build(); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 4); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(SCALE_WIDE_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ C.MICROS_PER_SECOND, @@ -123,7 +123,7 @@ public class FrameDropTest { /* expectedFrameRate= */ 3, /* targetFrameRate= */ 3)) .build(); - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/VideoFrameProcessorTestRunner.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/VideoFrameProcessorTestRunner.java index 410675eee5..8a66ba107c 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/VideoFrameProcessorTestRunner.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/VideoFrameProcessorTestRunner.java @@ -42,6 +42,7 @@ import androidx.media3.common.GlTextureInfo; import androidx.media3.common.SurfaceInfo; import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.VideoFrameProcessor; +import androidx.media3.common.VideoFrameProcessor.InputType; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.UnstableApi; import com.google.common.collect.ImmutableList; @@ -70,7 +71,7 @@ public final class VideoFrameProcessorTestRunner { private float pixelWidthHeightRatio; private @MonotonicNonNull ColorInfo inputColorInfo; private @MonotonicNonNull ColorInfo outputColorInfo; - private @VideoFrameProcessor.InputType int inputType; + private @InputType int inputType; private OnOutputFrameAvailableForRenderingListener onOutputFrameAvailableListener; /** Creates a new instance with default values. */ @@ -199,7 +200,7 @@ public final class VideoFrameProcessorTestRunner { *

The default value is {@link VideoFrameProcessor#INPUT_TYPE_SURFACE}. */ @CanIgnoreReturnValue - public Builder setInputType(@VideoFrameProcessor.InputType int inputType) { + public Builder setInputType(@InputType int inputType) { this.inputType = inputType; return this; } @@ -263,7 +264,7 @@ public final class VideoFrameProcessorTestRunner { float pixelWidthHeightRatio, ColorInfo inputColorInfo, ColorInfo outputColorInfo, - @VideoFrameProcessor.InputType int inputType, + @InputType int inputType, OnOutputFrameAvailableForRenderingListener onOutputFrameAvailableForRenderingListener) throws VideoFrameProcessingException { this.testId = testId; @@ -341,7 +342,7 @@ public final class VideoFrameProcessorTestRunner { endFrameProcessing(); } - public void queueInputBitmap( + public void registerAndQueueInputBitmap( Bitmap inputBitmap, long durationUs, long offsetToAddUs, float frameRate) { videoFrameProcessor.setInputFrameInfo( new FrameInfo.Builder(inputBitmap.getWidth(), inputBitmap.getHeight()) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java index 59a332ef98..57c65cae6c 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java @@ -68,7 +68,7 @@ public class DefaultVideoFrameProcessorMultipleTextureOutputPixelTest { videoFrameProcessorTestRunner = getFrameProcessorTestRunnerBuilder(testId).build(); long offsetUs = 1_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ 3 * C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs, @@ -95,13 +95,13 @@ public class DefaultVideoFrameProcessorMultipleTextureOutputPixelTest { videoFrameProcessorTestRunner = getFrameProcessorTestRunnerBuilder(testId).build(); long offsetUs1 = 1_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(ORIGINAL_PNG_ASSET_PATH), /* durationUs= */ C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs1, /* frameRate= */ 2); long offsetUs2 = 2_000_000L; - videoFrameProcessorTestRunner.queueInputBitmap( + videoFrameProcessorTestRunner.registerAndQueueInputBitmap( readBitmap(MEDIA3_TEST_PNG_ASSET_PATH), /* durationUs= */ 3 * C.MICROS_PER_SECOND, /* offsetToAddUs= */ offsetUs2,