Format with google-java-format

androidx · Mar 4, 2024 · 8e76256 · 8e76256
1 parent 5fea852
commit 8e76256
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/libraries/common/src/main/java/androidx/media3/common/VideoGraph.java b/libraries/common/src/main/java/androidx/media3/common/VideoGraph.java
@@ -82,10 +82,11 @@ interface Listener {
 
   /**
    * Returns the {@link VideoFrameProcessor} that handles the processing for an input registered via
-   * {@link #registerInput(int)}. If the {@code inputId} is not {@linkplain #registerInput(int)
-   * registered} before, this method will throw an {@link IllegalStateException}.
+   * {@link #registerInput(int)}. If the {@code sequenceIndex} is not {@linkplain
+   * #registerInput(int) registered} before, this method will throw an {@link
+   * IllegalStateException}.
    */
-  VideoFrameProcessor getProcessor(int inputId);
+  VideoFrameProcessor getProcessor(int sequenceIndex);
 
   /**
    * Sets the output surface and supporting information.

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java b/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java
@@ -27,6 +27,7 @@
 import static androidx.media3.effect.DebugTraceUtil.logEvent;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+
 import android.content.Context;
 import android.opengl.EGLContext;
 import android.opengl.EGLDisplay;
@@ -46,8 +47,6 @@
 import androidx.media3.common.VideoGraph;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.common.util.Util;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -260,9 +259,9 @@ public void onEnded() {
   }
 
   @Override
-  public VideoFrameProcessor getProcessor(int inputId) {
-    checkState(Util.contains(preProcessors, inputId));
-    return preProcessors.get(inputId);
++  public VideoFrameProcessor getProcessor(int sequenceIndex) {
++    checkState(contains(preProcessors, sequenceIndex));
++    return preProcessors.get(sequenceIndex);
   }
 
   @Override

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/SingleInputVideoGraph.java b/libraries/effect/src/main/java/androidx/media3/effect/SingleInputVideoGraph.java
@@ -162,7 +162,7 @@ public void onEnded() {
   }
 
   @Override
-  public VideoFrameProcessor getProcessor(int inputId) {
+  public VideoFrameProcessor getProcessor(int sequenceIndex) {
     return checkStateNotNull(videoFrameProcessor);
   }
 

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java b/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java
@@ -46,11 +46,10 @@ interface Listener {
   }
 
   /**
-   * Registers a new input source, and returns a unique {@code inputId} corresponding to this
-   * source, to be used in {@link #queueInputTexture}.
+   * Registers a new input source.
    *
    * @param sequenceIndex The sequence index of the input source which is used to determine the
-   *     order of the input sources.
+   *     order of the input sources. The same index should to be used in {@link #queueInputTexture}.
    */
   void registerInputSource(int sequenceIndex);
 

diff --git a/...exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java b/...exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java
@@ -528,8 +528,8 @@ public VideoSinkImpl(
       //  reduces decoder timeouts, and consider restoring.
       videoFrameProcessorMaxPendingFrameCount =
           Util.getMaxPendingFramesCountForMediaCodecDecoders(context);
-      videoGraph.registerInput(0);
-      videoFrameProcessor = videoGraph.getProcessor(0);
+      videoGraph.registerInput(/* sequenceIndex= */ 0);
+      videoFrameProcessor = videoGraph.getProcessor(/* sequenceIndex= */ 0);
 
       videoEffects = new ArrayList<>();
       finalBufferPresentationTimeUs = C.TIME_UNSET;

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java
@@ -70,7 +70,7 @@ TransformerVideoGraph create(
    *
    * <p>If the method throws any {@link Exception}, the caller must call {@link #release}.
    *
-   * @param sequenceIndex The sequence index of the input, which can aid ordering of the inputs.
+   * @param sequenceIndex The index of the input sequence, which is used to order the inputs.
    */
   GraphInput createInput(int sequenceIndex) throws VideoFrameProcessingException;
 }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
@@ -540,8 +540,8 @@ public void registerInput(int sequenceIndex) throws VideoFrameProcessingExceptio
     }
 
     @Override
-    public VideoFrameProcessor getProcessor(int inputId) {
-      return videoGraph.getProcessor(inputId);
+    public VideoFrameProcessor getProcessor(int sequenceIndex) {
+      return videoGraph.getProcessor(sequenceIndex);
     }
 
     @Override