From f06bfc2e15f5d07a98cbfddc72f4c7c0f57d4793 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 20 Dec 2024 05:56:45 -0800 Subject: [PATCH] Log errors in BaseGlShaderProgram and QueueingGlShaderProgram. PiperOrigin-RevId: 708297631 --- .../java/androidx/media3/effect/BaseGlShaderProgram.java | 9 ++++++++- .../androidx/media3/effect/QueuingGlShaderProgram.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/BaseGlShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/BaseGlShaderProgram.java index f26aef7f78..48bd843cc4 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/BaseGlShaderProgram.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/BaseGlShaderProgram.java @@ -21,6 +21,7 @@ import androidx.media3.common.GlObjectsProvider; import androidx.media3.common.GlTextureInfo; import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.util.GlUtil; +import androidx.media3.common.util.Log; import androidx.media3.common.util.Size; import androidx.media3.common.util.UnstableApi; import com.google.common.util.concurrent.MoreExecutors; @@ -41,6 +42,7 @@ import java.util.concurrent.Executor; */ @UnstableApi public abstract class BaseGlShaderProgram implements GlShaderProgram { + private static final String TAG = "BaseGlShaderProgram"; protected final TexturePool outputTexturePool; private InputListener inputListener; private OutputListener outputListener; @@ -61,7 +63,12 @@ public abstract class BaseGlShaderProgram implements GlShaderProgram { outputTexturePool = new TexturePool(useHighPrecisionColorComponents, texturePoolCapacity); inputListener = new InputListener() {}; outputListener = new OutputListener() {}; - errorListener = (frameProcessingException) -> {}; + errorListener = + (frameProcessingException) -> + Log.e( + TAG, + "Exception caught by default BaseGlShaderProgram errorListener.", + frameProcessingException); errorListenerExecutor = MoreExecutors.directExecutor(); inputWidth = C.LENGTH_UNSET; inputHeight = C.LENGTH_UNSET; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/QueuingGlShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/QueuingGlShaderProgram.java index e01bcde03f..b544ebb968 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/QueuingGlShaderProgram.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/QueuingGlShaderProgram.java @@ -26,6 +26,7 @@ import androidx.media3.common.GlTextureInfo; import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.util.GlRect; import androidx.media3.common.util.GlUtil; +import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; @@ -72,6 +73,7 @@ import java.util.concurrent.TimeUnit; /* package */ final class QueuingGlShaderProgram implements GlShaderProgram { private static final long PROCESSING_TIMEOUT_MS = 500_000L; + private static final String TAG = "QueuingGlShaderProgram"; /** A concurrent effect that is applied by the {@link QueuingGlShaderProgram}. */ public interface ConcurrentEffect { @@ -167,7 +169,12 @@ import java.util.concurrent.TimeUnit; outputTexturePool = new TexturePool(useHighPrecisionColorComponents, queueSize); inputListener = new InputListener() {}; outputListener = new OutputListener() {}; - errorListener = (frameProcessingException) -> {}; + errorListener = + (frameProcessingException) -> + Log.e( + TAG, + "Exception caught by default QueuingGlShaderProgram errorListener.", + frameProcessingException); errorListenerExecutor = MoreExecutors.directExecutor(); inputWidth = C.LENGTH_UNSET; inputHeight = C.LENGTH_UNSET;