From 0843444a34cc3741658f316ae9511d9e9bdd91bb Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Mon, 2 Sep 2024 07:01:07 -0700 Subject: [PATCH] Fix order of elements in FrameworkMuxer.java PiperOrigin-RevId: 670205944 --- .../media3/transformer/FrameworkMuxer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java index 6668f380bc..428df2358f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java @@ -45,15 +45,6 @@ import java.util.Map; /** {@link Muxer} implementation that uses a {@link MediaMuxer}. */ /* package */ final class FrameworkMuxer implements Muxer { - public static final String MUXER_STOPPING_FAILED_ERROR_MESSAGE = "Failed to stop the MediaMuxer"; - - // MediaMuxer supported sample formats are documented in MediaMuxer.addTrack(MediaFormat). - private static final ImmutableList SUPPORTED_VIDEO_SAMPLE_MIME_TYPES = - getSupportedVideoSampleMimeTypes(); - private static final ImmutableList SUPPORTED_AUDIO_SAMPLE_MIME_TYPES = - ImmutableList.of(MimeTypes.AUDIO_AAC, MimeTypes.AUDIO_AMR_NB, MimeTypes.AUDIO_AMR_WB); - private static final String TAG = "FrameworkMuxer"; - /** {@link Muxer.Factory} for {@link FrameworkMuxer}. */ public static final class Factory implements Muxer.Factory { private long videoDurationUs; @@ -105,6 +96,15 @@ import java.util.Map; } } + public static final String MUXER_STOPPING_FAILED_ERROR_MESSAGE = "Failed to stop the MediaMuxer"; + + // MediaMuxer supported sample formats are documented in MediaMuxer.addTrack(MediaFormat). + private static final ImmutableList SUPPORTED_VIDEO_SAMPLE_MIME_TYPES = + getSupportedVideoSampleMimeTypes(); + private static final ImmutableList SUPPORTED_AUDIO_SAMPLE_MIME_TYPES = + ImmutableList.of(MimeTypes.AUDIO_AAC, MimeTypes.AUDIO_AMR_NB, MimeTypes.AUDIO_AMR_WB); + private static final String TAG = "FrameworkMuxer"; + private final MediaMuxer mediaMuxer; private final long videoDurationUs; private final Map trackTokenToLastPresentationTimeUs;