From 9a2bfc40425a89bb96be7e541ad55ad85d7fedc4 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 25 Jul 2023 16:31:05 +0100 Subject: [PATCH] Prioritize H.265 and H.264 over other formats This should make no functional difference because `SampleExporter` always checks for H.265 and H.264 first. However, in case we ever change that code, these are used in priority order so it's better to order them accordingly. PiperOrigin-RevId: 550894935 --- .../java/androidx/media3/transformer/FrameworkMuxer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 6a3a86f49e..1d9a060afe 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java @@ -44,11 +44,11 @@ import java.nio.ByteBuffer; private static final ImmutableList SUPPORTED_VIDEO_SAMPLE_MIME_TYPES = Util.SDK_INT >= 24 ? ImmutableList.of( - MimeTypes.VIDEO_H263, + MimeTypes.VIDEO_H265, MimeTypes.VIDEO_H264, - MimeTypes.VIDEO_MP4V, - MimeTypes.VIDEO_H265) - : ImmutableList.of(MimeTypes.VIDEO_H263, MimeTypes.VIDEO_H264, MimeTypes.VIDEO_MP4V); + MimeTypes.VIDEO_H263, + MimeTypes.VIDEO_MP4V) + : ImmutableList.of(MimeTypes.VIDEO_H264, MimeTypes.VIDEO_H263, MimeTypes.VIDEO_MP4V); private static final ImmutableList SUPPORTED_AUDIO_SAMPLE_MIME_TYPES = ImmutableList.of(MimeTypes.AUDIO_AAC, MimeTypes.AUDIO_AMR_NB, MimeTypes.AUDIO_AMR_WB);