From 9a1e7fbdf41e9de1f5d69590a305ebfafaa3ad07 Mon Sep 17 00:00:00 2001 From: leonwind Date: Tue, 23 Aug 2022 13:16:17 +0000 Subject: [PATCH] Bind contrastFactor in constructor instead of drawFrame method. PiperOrigin-RevId: 469438747 --- .../main/java/androidx/media3/effect/ContrastProcessor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java index ae393885c6..e267862ffe 100644 --- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java +++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java @@ -31,13 +31,12 @@ import java.io.IOException; private static final String FRAGMENT_SHADER_PATH = "shaders/fragment_shader_contrast_es2.glsl"; private final GlProgram glProgram; - private final float contrastFactor; public ContrastProcessor(Context context, Contrast contrastEffect, boolean useHdr) throws FrameProcessingException { super(useHdr); // Use 1.0001f to avoid division by zero issues. - contrastFactor = (1 + contrastEffect.contrast) / (1.0001f - contrastEffect.contrast); + float contrastFactor = (1 + contrastEffect.contrast) / (1.0001f - contrastEffect.contrast); try { glProgram = new GlProgram(context, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH); @@ -55,6 +54,7 @@ import java.io.IOException; Matrix.setIdentityM(identityMatrix, /* smOffset= */ 0); glProgram.setFloatsUniform("uTransformationMatrix", identityMatrix); glProgram.setFloatsUniform("uTexTransformationMatrix", identityMatrix); + glProgram.setFloatUniform("uContrastFactor", contrastFactor); } @Override @@ -67,7 +67,6 @@ import java.io.IOException; try { glProgram.use(); glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0); - glProgram.setFloatUniform("uContrastFactor", contrastFactor); glProgram.bindAttributesAndUniforms(); // The four-vertex triangle strip forms a quad.