From 17e1d37112ac4d61510fbd9d74b1b5e083d075a9 Mon Sep 17 00:00:00 2001
From: dancho <dancho@google.com>
Date: Mon, 23 Sep 2024 05:32:17 -0700
Subject: [PATCH] Fix GL filtering algorithm used when experimental fix is
 disabled

When working on SurfaceTexture crop fix, we accidentally switched
to GL_NEAREST resampling.

PiperOrigin-RevId: 677751819
---
 .../src/main/java/androidx/media3/common/util/GlProgram.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java b/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
index 3187cdf3aa..674c3e64b8 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
@@ -473,7 +473,7 @@ public final class GlProgram {
                   ? GLES20.GL_TEXTURE_2D
                   : GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
               texIdValue,
-              type == GLES20.GL_SAMPLER_2D && !externalTexturesRequireNearestSampling
+              type == GLES20.GL_SAMPLER_2D || !externalTexturesRequireNearestSampling
                   ? GLES20.GL_LINEAR
                   : GLES20.GL_NEAREST);
           GLES20.glUniform1i(location, texUnitIndex);