From e60ba54ddf309832647dff2f38da022b679ed9ad Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Fri, 6 May 2022 12:06:40 +0100 Subject: [PATCH] Transformer GL: Remove obsolete TODOs. We won't try to provide/rethrow helpful error messages that are already provided by GL, as this sort of task would expand into writing a GL verifier. A Gl verifier is unnecessarily complex for minimal payoff, especially as Apps expected to read GL error messages would mostly be those writing custom GlFrameProcessors, who should be already be familiar with reading GL error messages anyways. PiperOrigin-RevId: 446950837 --- .../androidx/media3/transformer/ExternalCopyFrameProcessor.java | 2 -- .../media3/transformer/MatrixTransformationFrameProcessor.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExternalCopyFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExternalCopyFrameProcessor.java index 05835db6df..dcd5bcb463 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExternalCopyFrameProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExternalCopyFrameProcessor.java @@ -65,8 +65,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; checkArgument(inputHeight > 0, "inputHeight must be positive"); size = new Size(inputWidth, inputHeight); - // TODO(b/205002913): check the loaded program is consistent with the attributes and uniforms - // expected in the code. String vertexShaderFilePath = enableExperimentalHdrEditing ? VERTEX_SHADER_TEX_TRANSFORM_ES3_PATH diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationFrameProcessor.java index bcde12b504..b81dd74da8 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationFrameProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationFrameProcessor.java @@ -82,8 +82,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; checkArgument(inputHeight > 0, "inputHeight must be positive"); outputSize = matrixTransformation.configure(inputWidth, inputHeight); - // TODO(b/205002913): check the loaded program is consistent with the attributes and uniforms - // expected in the code. glProgram = new GlProgram(context, VERTEX_SHADER_TRANSFORMATION_PATH, FRAGMENT_SHADER_PATH); glProgram.setSamplerTexIdUniform("uTexSampler", inputTexId, /* texUnitIndex= */ 0); // Draw the frame on the entire normalized device coordinate space, from -1 to 1, for x and y.