From b97ec5edfc758bc9ed0c3b71f425acb6a1dc3071 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Wed, 17 May 2023 17:49:53 +0000 Subject: [PATCH] Add default constructor for InAppMuxer.Factory PiperOrigin-RevId: 532838813 (cherry picked from commit 410840c9e19836fe1fc5c38001a6150fefe29027) --- .../TransformerWithInAppMuxerEndToEndTest.java | 10 ++-------- .../mh/TransformerWithInAppMuxerEndToEndTest.java | 6 +----- .../java/androidx/media3/transformer/InAppMuxer.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java index bd013cdb90..00432e1905 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java @@ -53,10 +53,7 @@ public class TransformerWithInAppMuxerEndToEndTest { public void videoEditing_completesSuccessfully() throws Exception { String testId = "videoEditing_completesSuccessfully"; Transformer transformer = - new Transformer.Builder(context) - .setMuxerFactory( - new InAppMuxer.Factory(DefaultMuxer.Factory.DEFAULT_MAX_DELAY_BETWEEN_SAMPLES_MS)) - .build(); + new Transformer.Builder(context).setMuxerFactory(new InAppMuxer.Factory()).build(); ImmutableList videoEffects = ImmutableList.of(RgbFilter.createGrayscaleFilter()); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + inputFile)); EditedMediaItem editedMediaItem = @@ -76,10 +73,7 @@ public class TransformerWithInAppMuxerEndToEndTest { public void audioEditing_completesSuccessfully() throws Exception { String testId = "audioEditing_completesSuccessfully"; Transformer transformer = - new Transformer.Builder(context) - .setMuxerFactory( - new InAppMuxer.Factory(DefaultMuxer.Factory.DEFAULT_MAX_DELAY_BETWEEN_SAMPLES_MS)) - .build(); + new Transformer.Builder(context).setMuxerFactory(new InAppMuxer.Factory()).build(); ChannelMixingAudioProcessor channelMixingAudioProcessor = new ChannelMixingAudioProcessor(); channelMixingAudioProcessor.putChannelMixingMatrix( ChannelMixingMatrix.create(/* inputChannelCount= */ 1, /* outputChannelCount= */ 2)); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java index 5a68a30f8f..2a6fd46193 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java @@ -25,7 +25,6 @@ import androidx.media3.common.Effect; import androidx.media3.common.MediaItem; import androidx.media3.effect.RgbFilter; import androidx.media3.transformer.AndroidTestUtil; -import androidx.media3.transformer.DefaultMuxer; import androidx.media3.transformer.EditedMediaItem; import androidx.media3.transformer.Effects; import androidx.media3.transformer.ExportTestResult; @@ -50,10 +49,7 @@ public class TransformerWithInAppMuxerEndToEndTest { return; } Transformer transformer = - new Transformer.Builder(context) - .setMuxerFactory( - new InAppMuxer.Factory(DefaultMuxer.Factory.DEFAULT_MAX_DELAY_BETWEEN_SAMPLES_MS)) - .build(); + new Transformer.Builder(context).setMuxerFactory(new InAppMuxer.Factory()).build(); ImmutableList videoEffects = ImmutableList.of(RgbFilter.createGrayscaleFilter()); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_AV1_VIDEO_URI_STRING)); EditedMediaItem editedMediaItem = diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java index 31d5cefbb4..f80f7f4e8b 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java @@ -42,6 +42,16 @@ public final class InAppMuxer implements Muxer { public static final class Factory implements Muxer.Factory { private final long maxDelayBetweenSamplesMs; + /** + * Creates an instance with {@link Muxer#getMaxDelayBetweenSamplesMs() maxDelayBetweenSamplesMs} + * set to {@link DefaultMuxer.Factory#DEFAULT_MAX_DELAY_BETWEEN_SAMPLES_MS}. + */ + public Factory() { + this( + /* maxDelayBetweenSamplesMs= */ DefaultMuxer.Factory + .DEFAULT_MAX_DELAY_BETWEEN_SAMPLES_MS); + } + /** {@link Muxer.Factory} for {@link InAppMuxer}. */ public Factory(long maxDelayBetweenSamplesMs) { this.maxDelayBetweenSamplesMs = maxDelayBetweenSamplesMs;