diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java index 328608b582..4be2483b9f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java @@ -139,7 +139,7 @@ import org.checkerframework.dataflow.qual.Pure; @Override @Nullable - public DecoderInputBuffer dequeueInputBuffer() { + public DecoderInputBuffer getInputBuffer() { return hasPendingInputBuffer ? null : inputBuffer; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EncodedSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EncodedSamplePipeline.java index 4e1722d684..8ae349cdaf 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/EncodedSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EncodedSamplePipeline.java @@ -47,7 +47,7 @@ import androidx.media3.decoder.DecoderInputBuffer; @Override @Nullable - public DecoderInputBuffer dequeueInputBuffer() { + public DecoderInputBuffer getInputBuffer() { return hasPendingBuffer ? null : buffer; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderAudioRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderAudioRenderer.java index d68aa593b3..017561ac79 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderAudioRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderAudioRenderer.java @@ -60,7 +60,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; @Override @RequiresNonNull("sampleConsumer") protected boolean feedConsumerFromDecoder() throws TransformationException { - @Nullable DecoderInputBuffer sampleConsumerInputBuffer = sampleConsumer.dequeueInputBuffer(); + @Nullable DecoderInputBuffer sampleConsumerInputBuffer = sampleConsumer.getInputBuffer(); if (sampleConsumerInputBuffer == null) { return false; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java index 7cac5b8b17..40a1a1de17 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java @@ -221,7 +221,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; */ @RequiresNonNull("sampleConsumer") private boolean feedConsumerFromInput() { - @Nullable DecoderInputBuffer sampleConsumerInputBuffer = sampleConsumer.dequeueInputBuffer(); + @Nullable DecoderInputBuffer sampleConsumerInputBuffer = sampleConsumer.getInputBuffer(); if (sampleConsumerInputBuffer == null) { return false; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java index 564a8151a4..f5d6650b0c 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java @@ -39,19 +39,20 @@ public interface SampleConsumer { * Returns a buffer if the consumer is ready to accept input, and {@code null} otherwise. * *

If the consumer is ready to accept input and this method is called multiple times before - * {@linkplain #queueInputBuffer() queuing} input, the same buffer instance is returned. + * {@linkplain #queueInputBuffer() queuing} input, the same {@link DecoderInputBuffer} instance is + * returned. * *

Should only be used for compressed data and raw audio data. */ @Nullable - default DecoderInputBuffer dequeueInputBuffer() { + default DecoderInputBuffer getInputBuffer() { throw new UnsupportedOperationException(); } /** * Informs the consumer that its input buffer contains new input. * - *

Should be called after filling the input buffer from {@link #dequeueInputBuffer()} with new + *

Should be called after filling the input buffer from {@link #getInputBuffer()} with new * input. * *

Should only be used for compressed data and raw audio data. diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index 2bd8705140..8bc5ac9ba0 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -278,7 +278,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; // The sample pipeline is drained before dequeuing input to maximise the chances of having an // input buffer to dequeue. while (samplePipeline.processData()) {} - pendingInputBuffer = samplePipeline.dequeueInputBuffer(); + pendingInputBuffer = samplePipeline.getInputBuffer(); dequeueBufferConditionVariable.open(); if (forceSilentAudio) { @@ -640,7 +640,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @Nullable @Override - public DecoderInputBuffer dequeueInputBuffer() { + public DecoderInputBuffer getInputBuffer() { if (released) { // Make sure there is no dequeue action waiting on the asset loader thread when it is // being released to avoid a deadlock. diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ExoPlayerAssetLoaderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ExoPlayerAssetLoaderTest.java index fa8a55bd28..4e5d9cabfc 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/ExoPlayerAssetLoaderTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ExoPlayerAssetLoaderTest.java @@ -139,7 +139,7 @@ public class ExoPlayerAssetLoaderTest { @Nullable @Override - public DecoderInputBuffer dequeueInputBuffer() { + public DecoderInputBuffer getInputBuffer() { return null; }