Skip to content

Commit 61b1c66

Browse files
committed
fix naming and formatting
1 parent e890be6 commit 61b1c66

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoCompositor.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.opengl.EGLSurface;
2828
import android.opengl.GLES20;
2929
import android.util.SparseArray;
30-
3130
import androidx.annotation.GuardedBy;
3231
import androidx.annotation.IntRange;
3332
import androidx.annotation.Nullable;
@@ -43,18 +42,15 @@
4342
import androidx.media3.common.util.Size;
4443
import androidx.media3.common.util.UnstableApi;
4544
import androidx.media3.common.util.Util;
46-
4745
import com.google.common.collect.ImmutableList;
4846
import com.google.common.collect.Iterables;
49-
50-
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
51-
5247
import java.io.IOException;
5348
import java.util.ArrayDeque;
5449
import java.util.Iterator;
5550
import java.util.List;
5651
import java.util.Queue;
5752
import java.util.concurrent.ExecutorService;
53+
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
5854

5955
/**
6056
* A basic {@link VideoCompositor} implementation that takes in frames from input sources' streams
@@ -146,9 +142,9 @@ public DefaultVideoCompositor(
146142
}
147143

148144
@Override
149-
public synchronized int registerInputSource(int sequenceId) {
150-
inputSources.put(sequenceId, new InputSource());
151-
return sequenceId;
145+
public synchronized int registerInputSource(int sequenceIndex) {
146+
inputSources.put(sequenceIndex, new InputSource());
147+
return sequenceIndex;
152148
}
153149

154150
@Override

libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ public void onEnded() {
258258
onPreProcessingVideoFrameProcessorEnded(videoCompositorInputId);
259259
}
260260
});
261-
262261
preProcessors.put(videoCompositorInputId, preProcessor);
263262
return videoCompositorInputId;
264263
}

libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ interface Listener {
4949
* Registers a new input source, and returns a unique {@code inputId} corresponding to this
5050
* source, to be used in {@link #queueInputTexture}.
5151
*
52-
* @param sequenceId The sequence ID of the input source, which is can be used to determine the
53-
* order of the input sources.
52+
* @param sequenceIndex The sequence index of the input source, which is can be used to determine
53+
* the order of the input sources.
5454
*/
55-
int registerInputSource(int sequenceId);
55+
int registerInputSource(int sequenceIndex);
5656
/**
5757
* Signals that no more frames will come from the upstream {@link GlTextureProducer.Listener}.
5858
*

libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public SampleExporter(Format firstInputFormat, MuxerWrapper muxerWrapper) {
6767
* @param sequenceIndex The sequence index of the input.
6868
* @throws ExportException If an error occurs getting the input.
6969
*/
70-
public abstract GraphInput getInput(EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException;
70+
public abstract GraphInput getInput(
71+
EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException;
7172

7273
/**
7374
* Processes the input data and returns whether it may be possible to process more data by calling

libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ public SampleConsumer onOutputFormat(Format assetLoaderOutputFormat) throws Expo
582582
}
583583

584584
GraphInput sampleExporterInput =
585-
sampleExporter.getInput(firstEditedMediaItem, assetLoaderOutputFormat, sequenceIndex);
585+
sampleExporter.getInput(firstEditedMediaItem, assetLoaderOutputFormat, sequenceIndex);
586586
OnMediaItemChangedListener onMediaItemChangedListener =
587587
(editedMediaItem, durationUs, decodedFormat, isLast) -> {
588588
onMediaItemChanged(trackType, durationUs, isLast);

libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import android.media.MediaCodecInfo;
3232
import android.util.Pair;
3333
import android.view.Surface;
34-
3534
import androidx.annotation.Nullable;
3635
import androidx.annotation.VisibleForTesting;
3736
import androidx.media3.common.C;
@@ -50,17 +49,14 @@
5049
import androidx.media3.effect.DebugTraceUtil;
5150
import androidx.media3.effect.VideoCompositorSettings;
5251
import androidx.media3.exoplayer.mediacodec.MediaCodecUtil;
53-
5452
import com.google.common.collect.ImmutableList;
5553
import com.google.common.util.concurrent.MoreExecutors;
56-
54+
import java.nio.ByteBuffer;
55+
import java.util.List;
5756
import org.checkerframework.checker.initialization.qual.Initialized;
5857
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
5958
import org.checkerframework.dataflow.qual.Pure;
6059

61-
import java.nio.ByteBuffer;
62-
import java.util.List;
63-
6460
/** Processes, encodes and muxes raw video frames. */
6561
/* package */ final class VideoSampleExporter extends SampleExporter {
6662

0 commit comments

Comments
 (0)