The caller is responsible for ensuring that samples of different track types are well
* interleaved by calling {@link #writeSampleData(Mp4Muxer.TrackToken, ByteBuffer,
- * MediaCodec.BufferInfo)} in an order that interleaves samples from different tracks.
+ * BufferInfo)} in an order that interleaves samples from different tracks.
*
*/
@UnstableApi
@@ -62,23 +63,65 @@ public final class FragmentedMp4Muxer implements Muxer {
/** The default fragment duration. */
public static final long DEFAULT_FRAGMENT_DURATION_MS = 2_000;
+ /** A builder for {@link FragmentedMp4Muxer} instances. */
+ public static final class Builder {
+ private final FileOutputStream fileOutputStream;
+
+ private long fragmentDurationMs;
+ private boolean sampleCopyEnabled;
+
+ /**
+ * Creates a {@link Builder} instance with default values.
+ *
+ * @param fileOutputStream The {@link FileOutputStream} to write the media data to.
+ */
+ public Builder(FileOutputStream fileOutputStream) {
+ this.fileOutputStream = fileOutputStream;
+ fragmentDurationMs = DEFAULT_FRAGMENT_DURATION_MS;
+ sampleCopyEnabled = true;
+ }
+
+ /**
+ * Sets the fragment duration (in milliseconds).
+ *
+ * The muxer will attempt to create fragments of the given duration but the actual duration
+ * might be greater depending upon the frequency of sync samples.
+ *
+ *
The default value is {@link #DEFAULT_FRAGMENT_DURATION_MS}.
+ */
+ @CanIgnoreReturnValue
+ public Builder setFragmentDurationMs(long fragmentDurationMs) {
+ this.fragmentDurationMs = fragmentDurationMs;
+ return this;
+ }
+
+ /**
+ * Sets whether to enable the sample copy.
+ *
+ *
If the sample copy is enabled, {@link #writeSampleData(TrackToken, ByteBuffer,
+ * BufferInfo)} copies the input {@link ByteBuffer} and {@link BufferInfo} before it returns, so
+ * it is safe to reuse them immediately. Otherwise, the muxer takes ownership of the {@link
+ * ByteBuffer} and the {@link BufferInfo} and the caller must not modify them.
+ *
+ *
The default value is {@code true}.
+ */
+ @CanIgnoreReturnValue
+ public Builder setSampleCopyEnabled(boolean enabled) {
+ this.sampleCopyEnabled = enabled;
+ return this;
+ }
+
+ /** Builds a {@link FragmentedMp4Muxer} instance. */
+ public FragmentedMp4Muxer build() {
+ return new FragmentedMp4Muxer(fileOutputStream, fragmentDurationMs, sampleCopyEnabled);
+ }
+ }
+
private final FragmentedMp4Writer fragmentedMp4Writer;
private final MetadataCollector metadataCollector;
- /** Creates an instance with {@link #DEFAULT_FRAGMENT_DURATION_MS}. */
- public FragmentedMp4Muxer(FileOutputStream fileOutputStream) {
- this(fileOutputStream, DEFAULT_FRAGMENT_DURATION_MS);
- }
-
- /**
- * Creates an instance.
- *
- * @param fileOutputStream The {@link FileOutputStream} to write the media data to.
- * @param fragmentDurationMs The fragment duration (in milliseconds). The muxer will attempt to
- * create fragments of the given duration but the actual duration might be greater depending
- * upon the frequency of sync samples.
- */
- public FragmentedMp4Muxer(FileOutputStream fileOutputStream, long fragmentDurationMs) {
+ private FragmentedMp4Muxer(
+ FileOutputStream fileOutputStream, long fragmentDurationMs, boolean sampleCopyEnabled) {
checkNotNull(fileOutputStream);
metadataCollector = new MetadataCollector();
Mp4MoovStructure moovStructure =
@@ -86,7 +129,11 @@ public final class FragmentedMp4Muxer implements Muxer {
metadataCollector, Mp4Muxer.LAST_FRAME_DURATION_BEHAVIOR_DUPLICATE_PREV_DURATION);
fragmentedMp4Writer =
new FragmentedMp4Writer(
- fileOutputStream, moovStructure, AnnexBToAvccConverter.DEFAULT, fragmentDurationMs);
+ fileOutputStream,
+ moovStructure,
+ AnnexBToAvccConverter.DEFAULT,
+ fragmentDurationMs,
+ sampleCopyEnabled);
}
@Override
@@ -97,19 +144,22 @@ public final class FragmentedMp4Muxer implements Muxer {
/**
* {@inheritDoc}
*
- *
The samples are cached and are written in batches so the caller must not change the {@link
- * ByteBuffer} and the {@link MediaCodec.BufferInfo} after calling this method.
+ *
Samples are written to the disk in batches. If {@link Builder#setSampleCopyEnabled(boolean)
+ * sample copying} is disabled, the {@code byteBuffer} and the {@code bufferInfo} must not be
+ * modified after calling this method. Otherwise, they are copied and it is safe to modify them
+ * after this method returns.
*
*
Note: Out of order B-frames are currently not supported.
*
* @param trackToken The {@link TrackToken} for which this sample is being written.
- * @param byteBuffer The encoded sample.
- * @param bufferInfo The {@link MediaCodec.BufferInfo} related to this sample.
+ * @param byteBuffer The encoded sample. The muxer takes ownership of the buffer if {@link
+ * Builder#setSampleCopyEnabled(boolean) sample copying} is disabled. Otherwise, the position
+ * of the buffer is updated but the caller retains ownership.
+ * @param bufferInfo The {@link BufferInfo} related to this sample.
* @throws IOException If there is any error while writing data to the disk.
*/
@Override
- public void writeSampleData(
- TrackToken trackToken, ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo)
+ public void writeSampleData(TrackToken trackToken, ByteBuffer byteBuffer, BufferInfo bufferInfo)
throws IOException {
fragmentedMp4Writer.writeSampleData(trackToken, byteBuffer, bufferInfo);
}
diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/FragmentedMp4Writer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/FragmentedMp4Writer.java
index 052f401d1d..d74a9a2abb 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/FragmentedMp4Writer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/FragmentedMp4Writer.java
@@ -66,6 +66,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final AnnexBToAvccConverter annexBToAvccConverter;
private final List