From 0baa4ff621e4ef96bb9d40daeb32f09e170925a8 Mon Sep 17 00:00:00 2001 From: kimvde Date: Tue, 28 May 2024 05:52:30 -0700 Subject: [PATCH] Reset input capacity when setting external shader program Before this CL, externalShaderProgramInputCapacity was not reset when the external shader program was reset (which occurs when the InputSwitcher switches to an input with a different ColorInfo). This is due to a regression introduced in https://github.com/androidx/media/commit/bef3d518d2dd11155a759d4e62bd649e32752a2d. PiperOrigin-RevId: 637869215 --- .../main/java/androidx/media3/effect/ExternalTextureManager.java | 1 + 1 file changed, 1 insertion(+) 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 a07d486e37..c6ecd4ed98 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java @@ -191,6 +191,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @Override public void setSamplingGlShaderProgram(GlShaderProgram samplingGlShaderProgram) { checkState(samplingGlShaderProgram instanceof ExternalShaderProgram); + externalShaderProgramInputCapacity.set(0); this.externalShaderProgram = (ExternalShaderProgram) samplingGlShaderProgram; }