From b9fda89354fab647fc1903764112e1befe9e3f26 Mon Sep 17 00:00:00 2001 From: Luyuan Chen Date: Wed, 7 Feb 2024 20:56:42 +0000 Subject: [PATCH] Format with google-java-format --- .../src/main/java/androidx/media3/common/VideoGraph.java | 1 - .../src/main/java/androidx/media3/effect/VideoCompositor.java | 3 ++- .../main/java/androidx/media3/transformer/SampleExporter.java | 2 +- .../java/androidx/media3/transformer/VideoSampleExporter.java | 3 ++- 4 files changed, 5 insertions(+), 4 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 3221caa6bed..9ac269b8f5d 100644 --- a/libraries/common/src/main/java/androidx/media3/common/VideoGraph.java +++ b/libraries/common/src/main/java/androidx/media3/common/VideoGraph.java @@ -76,7 +76,6 @@ interface Listener { *

If the method throws, the caller must call {@link #release}. * * @param sequenceIndex The sequence index of the input which can aid ordering of the inputs. - * * @return The id of the registered input, which can be used to get the underlying {@link * VideoFrameProcessor} via {@link #getProcessor(int)}. */ 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 198a7d566d0..e8835c46b2c 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java @@ -50,9 +50,10 @@ interface Listener { * source, to be used in {@link #queueInputTexture}. * * @param sequenceIndex The sequence index of the input source, which is can be used to determine - * the order of the input sources. + * the order of the input sources. */ int registerInputSource(int sequenceIndex); + /** * Signals that no more frames will come from the upstream {@link GlTextureProducer.Listener}. * diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java index a04617089f4..c9c9d7a27d3 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java @@ -68,7 +68,7 @@ public SampleExporter(Format firstInputFormat, MuxerWrapper muxerWrapper) { * @throws ExportException If an error occurs getting the input. */ public abstract GraphInput getInput( - EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException; + EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException; /** * Processes the input data and returns whether it may be possible to process more data by calling 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 4d7d4d47e6b..cf09607308d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java @@ -168,7 +168,8 @@ public VideoSampleExporter( } @Override - public GraphInput getInput(EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException { + public GraphInput getInput(EditedMediaItem editedMediaItem, Format format, int sequenceIndex) + throws ExportException { try { return videoGraph.createInput(sequenceIndex); } catch (VideoFrameProcessingException e) {