From 51d60e1f3ac4cb170d0ca84a3cab31814e378e25 Mon Sep 17 00:00:00 2001 From: tofunmi Date: Wed, 10 Jan 2024 04:39:04 -0800 Subject: [PATCH] GaussianBlur: make short constructor call the longer one PiperOrigin-RevId: 597212434 --- .../shaders/fragment_shader_separable_convolution_es2.glsl | 6 +++--- .../src/main/java/androidx/media3/effect/GaussianBlur.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/effect/src/main/assets/shaders/fragment_shader_separable_convolution_es2.glsl b/libraries/effect/src/main/assets/shaders/fragment_shader_separable_convolution_es2.glsl index 2093c54aae..5e9357aedc 100644 --- a/libraries/effect/src/main/assets/shaders/fragment_shader_separable_convolution_es2.glsl +++ b/libraries/effect/src/main/assets/shaders/fragment_shader_separable_convolution_es2.glsl @@ -15,7 +15,10 @@ precision highp float; varying vec2 vTexSamplingCoord; +// Center position of the function in the lookup texture. +uniform vec2 uFunctionLookupCenter; uniform sampler2D uTexSampler; +uniform sampler2D uFunctionLookupSampler; // 1D function LUT, only 2D due to OpenGL ES 2.0 limitations. uniform int uIsHorizontal; // Size of one texel in the source image, along the axis of interest. @@ -32,9 +35,6 @@ uniform float uConvWidthTexels; // Need to be able convert steps in source texels to steps in the function // lookup texture. uniform float uFunctionLookupStepSize; -// Center position of the function in the lookup texture. -uniform vec2 uFunctionLookupCenter; -uniform sampler2D uFunctionLookupSampler; // Reference Implementation: void main() { diff --git a/libraries/effect/src/main/java/androidx/media3/effect/GaussianBlur.java b/libraries/effect/src/main/java/androidx/media3/effect/GaussianBlur.java index d92bd6d015..c7a699dba0 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/GaussianBlur.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/GaussianBlur.java @@ -50,8 +50,8 @@ public final class GaussianBlur extends SeparableConvolution { * @param sigma The half-width of 1 standard deviation, in pixels. */ public GaussianBlur(float sigma) { - this.sigma = sigma; - this.numStandardDeviations = 2.0f; + this(sigma, /* numStandardDeviations= */ 2.0f); + ; } @Override