From e229f957e6b4a2d382211e9b4ec71cf0570c30a9 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Thu, 6 Feb 2025 02:53:53 -0800
Subject: [PATCH] A few nits

PiperOrigin-RevId: 723859603
---
 .../media3/transformer/DefaultVideoCompositorPixelTest.java | 6 ++----
 .../main/java/androidx/media3/transformer/AudioGraph.java   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java
index 525856901c..7a367ddd9f 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java
@@ -816,13 +816,14 @@ public final class DefaultVideoCompositorPixelTest {
         String testId,
         TextureBitmapReader textureBitmapReader,
         VideoCompositor videoCompositor,
-        @Nullable ExecutorService executorService,
+        ExecutorService executorService,
         GlObjectsProvider glObjectsProvider,
         int inputIndex) {
       videoCompositor.registerInputSource(inputIndex);
       DefaultVideoFrameProcessor.Factory.Builder defaultVideoFrameProcessorFactoryBuilder =
           new DefaultVideoFrameProcessor.Factory.Builder()
               .setGlObjectsProvider(glObjectsProvider)
+              .setExecutorService(executorService)
               .setSdrWorkingColorSpace(DefaultVideoFrameProcessor.WORKING_COLOR_SPACE_LINEAR)
               .setTextureOutput(
                   /* textureOutputListener= */ (outputTextureProducer,
@@ -840,9 +841,6 @@ public final class DefaultVideoCompositorPixelTest {
                         presentationTimeUs);
                   },
                   /* textureOutputCapacity= */ 2);
-      if (executorService != null) {
-        defaultVideoFrameProcessorFactoryBuilder.setExecutorService(executorService);
-      }
       return new VideoFrameProcessorTestRunner.Builder()
           .setTestId(testId)
           .setVideoFrameProcessorFactory(defaultVideoFrameProcessorFactoryBuilder.build())
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java
index 0bfbcf08d6..1d57088fc1 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java
@@ -277,7 +277,6 @@ import java.util.Objects;
   }
 
   private boolean isMixerEnded() {
-    //    return !mixerOutput.hasRemaining() && activeInputCount == 0 && mixer.isEnded();
     return !mixerOutput.hasRemaining() && finishedInputs >= inputInfos.size() && mixer.isEnded();
   }