The caller can queue more input or signal {@link #signalEndOfVideoInput() signal end of + * input}. + */ + int INPUT_RESULT_SUCCESS = 1; + + /** + * The operation of queueing/registering input was unsuccessful. + * + *
The caller should queue try again later. + */ + int INPUT_RESULT_TRY_AGAIN_LATER = 2; + + /** + * The operation of queueing input successful and end of input has been automatically signalled. + * + *
The caller should not {@link #signalEndOfVideoInput() signal end of input} as this has + * already been done internally. + */ + int INPUT_RESULT_END_OF_STREAM = 3; + /** * Returns a {@link DecoderInputBuffer}, if available. * @@ -74,8 +114,10 @@ public interface SampleConsumer { * @param inputBitmap The {@link Bitmap} to queue to the consumer. * @param inStreamOffsetsUs The times within the current stream that the bitmap should be * displayed at. The timestamps should be monotonically increasing. + * @return The {@link InputResult} describing the result of the operation. */ - default boolean queueInputBitmap(Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { + default @InputResult int queueInputBitmap( + Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { throw new UnsupportedOperationException(); } @@ -99,10 +141,9 @@ public interface SampleConsumer { * * @param texId The ID of the texture to queue to the consumer. * @param presentationTimeUs The presentation time for the texture, in microseconds. - * @return Whether the texture was successfully queued. If {@code false}, the caller should try - * again later. + * @return The {@link InputResult} describing the result of the operation. */ - default boolean queueInputTexture(int texId, long presentationTimeUs) { + default @InputResult int queueInputTexture(int texId, long presentationTimeUs) { throw new UnsupportedOperationException(); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java index f8c4c09edc..97dad43229 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java @@ -398,21 +398,23 @@ import java.util.concurrent.atomic.AtomicInteger; } @Override - public boolean queueInputBitmap(Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { + public @InputResult int queueInputBitmap( + Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { if (isLooping) { long lastOffsetUs = C.TIME_UNSET; while (inStreamOffsetsUs.hasNext()) { long offsetUs = inStreamOffsetsUs.next(); if (totalDurationUs + offsetUs > maxSequenceDurationUs) { if (!isMaxSequenceDurationUsFinal) { - return false; + return INPUT_RESULT_TRY_AGAIN_LATER; } if (lastOffsetUs == C.TIME_UNSET) { if (!videoLoopingEnded) { videoLoopingEnded = true; signalEndOfVideoInput(); + return INPUT_RESULT_END_OF_STREAM; } - return false; + return INPUT_RESULT_TRY_AGAIN_LATER; } inStreamOffsetsUs = new ClippingIterator(inStreamOffsetsUs.copyOf(), lastOffsetUs); videoLoopingEnded = true; @@ -430,14 +432,15 @@ import java.util.concurrent.atomic.AtomicInteger; } @Override - public boolean queueInputTexture(int texId, long presentationTimeUs) { + public @InputResult int queueInputTexture(int texId, long presentationTimeUs) { long globalTimestampUs = totalDurationUs + presentationTimeUs; if (isLooping && globalTimestampUs >= maxSequenceDurationUs) { if (isMaxSequenceDurationUsFinal && !videoLoopingEnded) { videoLoopingEnded = true; signalEndOfVideoInput(); + return INPUT_RESULT_END_OF_STREAM; } - return false; + return INPUT_RESULT_TRY_AGAIN_LATER; } return sampleConsumer.queueInputTexture(texId, presentationTimeUs); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SingleInputVideoGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SingleInputVideoGraph.java index c8ed18e3f7..b28a1af642 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SingleInputVideoGraph.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SingleInputVideoGraph.java @@ -215,8 +215,11 @@ import java.util.concurrent.atomic.AtomicLong; } @Override - public boolean queueInputBitmap(Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { - return videoFrameProcessor.queueInputBitmap(inputBitmap, inStreamOffsetsUs); + public @InputResult int queueInputBitmap( + Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { + return videoFrameProcessor.queueInputBitmap(inputBitmap, inStreamOffsetsUs) + ? INPUT_RESULT_SUCCESS + : INPUT_RESULT_TRY_AGAIN_LATER; } @Override @@ -225,8 +228,10 @@ import java.util.concurrent.atomic.AtomicLong; } @Override - public boolean queueInputTexture(int texId, long presentationTimeUs) { - return videoFrameProcessor.queueInputTexture(texId, presentationTimeUs); + public @InputResult int queueInputTexture(int texId, long presentationTimeUs) { + return videoFrameProcessor.queueInputTexture(texId, presentationTimeUs) + ? INPUT_RESULT_SUCCESS + : INPUT_RESULT_TRY_AGAIN_LATER; } @Override diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TextureAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TextureAssetLoader.java index f7917926ce..a04ccdcf48 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TextureAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TextureAssetLoader.java @@ -18,6 +18,8 @@ package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.transformer.ExportException.ERROR_CODE_UNSPECIFIED; +import static androidx.media3.transformer.SampleConsumer.INPUT_RESULT_END_OF_STREAM; +import static androidx.media3.transformer.SampleConsumer.INPUT_RESULT_TRY_AGAIN_LATER; import static androidx.media3.transformer.Transformer.PROGRESS_STATE_AVAILABLE; import static androidx.media3.transformer.Transformer.PROGRESS_STATE_NOT_STARTED; import static java.lang.Math.round; @@ -28,6 +30,7 @@ import androidx.media3.common.Format; import androidx.media3.common.MimeTypes; import androidx.media3.common.OnInputFrameProcessedListener; import androidx.media3.common.util.UnstableApi; +import androidx.media3.transformer.SampleConsumer.InputResult; import com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @@ -50,6 +53,7 @@ public final class TextureAssetLoader implements AssetLoader { private @MonotonicNonNull SampleConsumer sampleConsumer; private @Transformer.ProgressState int progressState; private boolean isTrackAdded; + private boolean isEndOfStreamSignaled; private volatile boolean isStarted; private volatile long lastQueuedPresentationTimeUs; @@ -136,9 +140,13 @@ public final class TextureAssetLoader implements AssetLoader { sampleConsumer.setOnInputFrameProcessedListener(frameProcessedListener); } } - if (!sampleConsumer.queueInputTexture(texId, presentationTimeUs)) { + @InputResult int result = sampleConsumer.queueInputTexture(texId, presentationTimeUs); + if (result == INPUT_RESULT_TRY_AGAIN_LATER) { return false; } + if (result == INPUT_RESULT_END_OF_STREAM) { + isEndOfStreamSignaled = true; + } lastQueuedPresentationTimeUs = presentationTimeUs; return true; } catch (ExportException e) { @@ -156,7 +164,10 @@ public final class TextureAssetLoader implements AssetLoader { */ public void signalEndOfVideoInput() { try { - checkNotNull(sampleConsumer).signalEndOfVideoInput(); + if (!isEndOfStreamSignaled) { + isEndOfStreamSignaled = true; + checkNotNull(sampleConsumer).signalEndOfVideoInput(); + } } catch (RuntimeException e) { assetLoaderListener.onError(ExportException.createForAssetLoader(e, ERROR_CODE_UNSPECIFIED)); } diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java index 7a690e33cc..c7cd0c4920 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java @@ -127,8 +127,9 @@ public class ImageAssetLoaderTest { private static final class FakeSampleConsumer implements SampleConsumer { @Override - public boolean queueInputBitmap(Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { - return true; + public @InputResult int queueInputBitmap( + Bitmap inputBitmap, TimestampIterator inStreamOffsetsUs) { + return INPUT_RESULT_SUCCESS; } @Override diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TextureAssetLoaderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TextureAssetLoaderTest.java index 27b5a72f92..5bc2aeceff 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TextureAssetLoaderTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TextureAssetLoaderTest.java @@ -141,8 +141,8 @@ public class TextureAssetLoaderTest { public void setOnInputFrameProcessedListener(OnInputFrameProcessedListener listener) {} @Override - public boolean queueInputTexture(int texId, long presentationTimeUs) { - return true; + public @InputResult int queueInputTexture(int texId, long presentationTimeUs) { + return INPUT_RESULT_SUCCESS; } @Override