From 0403e5881d4045eb2b56675c70e1b1a2da51961b Mon Sep 17 00:00:00 2001 From: Luyuan Chen Date: Mon, 4 Mar 2024 11:57:36 +0000 Subject: [PATCH] Format with google-java-format --- .../src/main/java/androidx/media3/common/VideoGraph.java | 7 ++++--- .../androidx/media3/effect/MultipleInputVideoGraph.java | 8 +++----- .../androidx/media3/effect/SingleInputVideoGraph.java | 2 +- .../main/java/androidx/media3/effect/VideoCompositor.java | 5 ++--- .../exoplayer/video/CompositingVideoSinkProvider.java | 4 ++-- .../media3/transformer/TransformerVideoGraph.java | 2 +- .../androidx/media3/transformer/VideoSampleExporter.java | 4 ++-- 7 files changed, 15 insertions(+), 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 index d542d22c0f..537c9f0cb6 100644 --- 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 @@ public interface VideoGraph { /** * 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 index e4dbd5433b..f4f86653ba 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java @@ -47,8 +47,6 @@ import androidx.media3.common.VideoFrameProcessor; 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; @@ -262,9 +260,9 @@ public abstract class MultipleInputVideoGraph implements VideoGraph { } @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 index 02433043c6..31520c47ae 100644 --- 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 abstract class SingleInputVideoGraph implements VideoGraph { } @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 index 783a3f33bf..365f41446e 100644 --- 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 @@ public interface VideoCompositor extends GlTextureProducer { } /** - * 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/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java index 99d0a76777..b9a043136a 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java @@ -550,8 +550,8 @@ public final class CompositingVideoSinkProvider // 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 index 5883e8ab6f..59f5727a09 100644 --- 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 @@ import java.util.concurrent.Executor; * *

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 index 8c15528fc2..c1a5d4d011 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java @@ -548,8 +548,8 @@ import org.checkerframework.dataflow.qual.Pure; } @Override - public VideoFrameProcessor getProcessor(int inputId) { - return videoGraph.getProcessor(inputId); + public VideoFrameProcessor getProcessor(int sequenceIndex) { + return videoGraph.getProcessor(sequenceIndex); } @Override