From 91fb951e2a95883b0e1e59fdbafe71f84a3fd35e Mon Sep 17 00:00:00 2001 From: leonwind Date: Fri, 23 Sep 2022 14:21:38 +0000 Subject: [PATCH] Remove TODOs for merging RGB and MatrixTransformation processors. PiperOrigin-RevId: 476362571 (cherry picked from commit af19f82f994e5820889a9166c0a97606496fd17d) --- .../androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java | 1 - .../java/androidx/media3/effect/GlEffectsFrameProcessor.java | 1 - 2 files changed, 2 deletions(-) diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java index 5757ec33a4..d8a296096c 100644 --- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java +++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java @@ -388,7 +388,6 @@ public final class GlEffectsFrameProcessorPixelTest { } @Test - // TODO(b/239757183): Consider moving RgbMatrix composition tests to a new file. public void drawFrame_grayscaleAndIncreaseRedChannel_producesGrayscaleAndRedImage() throws Exception { String testId = "drawFrame_grayscaleAndIncreaseRedChannel"; diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java index 4b7508a8dd..1b5131d256 100644 --- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java +++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java @@ -167,7 +167,6 @@ public final class GlEffectsFrameProcessor implements FrameProcessor { * The first is an {@link ExternalTextureProcessor} and the last is a {@link * FinalMatrixTextureProcessorWrapper}. */ - // TODO(b/239757183): Squash GlMatrixTransformation and RgbMatrix together. private static ImmutableList getGlTextureProcessorsForGlEffects( Context context, List effects,