Set the default audio encoder bitrate in DefaultEncoderFactory.

Matches the approach for video frame rate. PiperOrigin-RevId: 595385930
androidx · Jan 3, 2024 · c230414 · c230414
1 parent 3ecf873
commit c230414
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java
@@ -33,8 +33,6 @@
 /** Processes, encodes and muxes raw audio samples. */
 /* package */ final class AudioSampleExporter extends SampleExporter {
 
-  private static final int DEFAULT_ENCODER_BITRATE = 128 * 1024;
-
   private final Codec encoder;
   private final AudioFormat encoderInputAudioFormat;
   private final DecoderInputBuffer encoderInputBuffer;
@@ -74,7 +72,6 @@ public AudioSampleExporter(
             .setChannelCount(encoderInputAudioFormat.channelCount)
             .setPcmEncoding(encoderInputAudioFormat.encoding)
             .setCodecs(firstInputFormat.codecs)
-            .setAverageBitrate(DEFAULT_ENCODER_BITRATE)
             .build();
 
     encoder =

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java
@@ -48,6 +48,7 @@
 // TODO(b/224949986) Split audio and video encoder factory.
 @UnstableApi
 public final class DefaultEncoderFactory implements Codec.EncoderFactory {
+  private static final int DEFAULT_AUDIO_BITRATE = 128 * 1024;
   private static final int DEFAULT_FRAME_RATE = 30;
 
   /** Best effort, or as-fast-as-possible priority setting for {@link MediaFormat#KEY_PRIORITY}. */
@@ -174,9 +175,11 @@ public DefaultEncoderFactory(
 
   @Override
   public DefaultCodec createForAudioEncoding(Format format) throws ExportException {
+    if (format.bitrate == Format.NO_VALUE) {
+      format = format.buildUpon().setAverageBitrate(DEFAULT_AUDIO_BITRATE).build();
+    }
     checkNotNull(format.sampleMimeType);
     MediaFormat mediaFormat = createMediaFormatFromFormat(format);
-    @Nullable
     ImmutableList<MediaCodecInfo> mediaCodecInfos =
         EncoderUtil.getSupportedEncoders(format.sampleMimeType);
     if (mediaCodecInfos.isEmpty()) {