From fef16b05d982e3c16bf999f6a84151796d3cbbb7 Mon Sep 17 00:00:00 2001 From: claincly Date: Thu, 14 Sep 2023 16:42:43 -0700 Subject: [PATCH] Fix flaky test becasue ExtTexMgr is not using emulator settings When running on emulators, ExternalTextureManager needs a longer timeout for forcing EOS, but we didn't catch a device name running on blaze: `generic_x86` PiperOrigin-RevId: 565513152 --- .../java/androidx/media3/effect/ExternalTextureManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java b/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java index 292a754dbd..07a3198797 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java @@ -30,6 +30,7 @@ import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.Log; import androidx.media3.common.util.Util; import androidx.media3.effect.GlShaderProgram.InputListener; +import com.google.common.base.Ascii; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Future; @@ -55,7 +56,10 @@ import java.util.concurrent.atomic.AtomicInteger; * pressured the decoder, and the decoder is not able to decode another frame. */ private static final long SURFACE_TEXTURE_TIMEOUT_MS = - Util.DEVICE.contains("emulator") ? 10_000 : 500; + Ascii.toLowerCase(Util.DEVICE).contains("emulator") + || Ascii.toLowerCase(Util.DEVICE).contains("generic") + ? 10_000 + : 500; private final GlObjectsProvider glObjectsProvider; private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;