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 740c4f1325..47466d8bfe 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java @@ -135,7 +135,7 @@ public class FrameDropTest { throws IOException { for (int i = 0; i < presentationTimesUs.size(); i++) { long presentationTimeUs = presentationTimesUs.get(i); - Bitmap actualBitmap = textureBitmapReader.getBitmap(presentationTimeUs); + Bitmap actualBitmap = textureBitmapReader.getBitmapAtPresentationTimeUs(presentationTimeUs); Bitmap expectedBitmap = readBitmap(Util.formatInvariant("%s/pts_%d.png", ASSET_PATH, presentationTimeUs)); maybeSaveTestBitmap( diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java index 87060fd2b8..3ff86df499 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java @@ -69,7 +69,7 @@ public final class TextureBitmapReader implements VideoFrameProcessorTestRunner. * @return The output {@link Bitmap} at a given {@code presentationTimeUs}. * @throws IllegalStateException If no such bitmap is produced. */ - public Bitmap getBitmap(long presentationTimeUs) { + public Bitmap getBitmapAtPresentationTimeUs(long presentationTimeUs) { return checkStateNotNull(outputTimestampsToBitmaps.get(presentationTimeUs)); } @@ -81,7 +81,8 @@ public final class TextureBitmapReader implements VideoFrameProcessorTestRunner. /** * Reads the given {@code outputTexture}. * - *
The read result can be fetched by calling one of the {@link #getBitmap} methods. + *
The read result can be fetched by calling {@link #getBitmapAtPresentationTimeUs} or {@link + * #getBitmap}. * *
This implementation incorrectly marks the output Bitmap as {@link Bitmap#isPremultiplied() * premultiplied}, even though OpenGL typically outputs only non-premultiplied alpha. Use {@link @@ -110,7 +111,8 @@ public final class TextureBitmapReader implements VideoFrameProcessorTestRunner. /** * Reads the given {@code outputTexture} as one with unpremultiplied alpha. * - *
The read result can be fetched by calling one of the {@link #getBitmap} methods. + *
The read result can be fetched by calling {@link #getBitmapAtPresentationTimeUs} or {@link
+ * #getBitmap}.
*/
@RequiresApi(19) // BitmapPixelTestUtil#createArgb8888BitmapFromFocusedGlFramebuffer.
public void readBitmapUnpremultipliedAlpha(GlTextureInfo outputTexture, long presentationTimeUs)
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 4547d308e7..65cb33dcee 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
@@ -78,7 +78,7 @@ public class DefaultVideoFrameProcessorMultipleTextureOutputPixelTest {
TextureBitmapReader textureBitmapReader = checkNotNull(this.textureBitmapReader);
Set