diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TranscodingTransformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TranscodingTransformer.java index ea59207926..3a4bec0b76 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TranscodingTransformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TranscodingTransformer.java @@ -252,17 +252,8 @@ public final class TranscodingTransformer { } /** - * Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. Supported - * values are: - * - *
Concurrent transformations on the same TranscodingTransformer object are not allowed. * - *
The output can contain at most one video track and one audio track. Other track types are - * ignored. For adaptive bitrate {@link MediaSource media sources}, the highest bitrate video and - * audio streams are selected. + *
The output is an MP4 file. It can contain at most one video track and one audio track. Other + * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest + * bitrate video and audio streams are selected. * * @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are @@ -572,9 +546,9 @@ public final class TranscodingTransformer { * *
Concurrent transformations on the same TranscodingTransformer object are not allowed. * - *
The output can contain at most one video track and one audio track. Other track types are - * ignored. For adaptive bitrate {@link MediaSource media sources}, the highest bitrate video and - * audio streams are selected. + *
The output is an MP4 file. It can contain at most one video track and one audio track. Other + * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest + * bitrate video and audio streams are selected. * * @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index 6455ae389f..c450130894 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -210,17 +210,8 @@ public final class Transformer { } /** - * Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. Supported - * values are: - * - *
Concurrent transformations on the same Transformer object are not allowed. * - *
The output can contain at most one video track and one audio track. Other track types are - * ignored. For adaptive bitrate {@link MediaSource media sources}, the highest bitrate video and - * audio streams are selected. + *
The output is an MP4 file. It can contain at most one video track and one audio track. Other + * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest + * bitrate video and audio streams are selected. * * @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are @@ -460,9 +434,9 @@ public final class Transformer { * *
Concurrent transformations on the same Transformer object are not allowed. * - *
The output can contain at most one video track and one audio track. Other track types are - * ignored. For adaptive bitrate {@link MediaSource media sources}, the highest bitrate video and - * audio streams are selected. + *
The output is an MP4 file. It can contain at most one video track and one audio track. Other + * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest + * bitrate video and audio streams are selected. * * @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java index e27bc2e037..7e19f2c250 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java @@ -30,10 +30,10 @@ import org.junit.runner.RunWith; public class TransformerBuilderTest { @Test - public void setContainerMimeType_unsupportedMimeType_throws() { + public void setOutputMimeType_unsupportedMimeType_throws() { assertThrows( IllegalStateException.class, - () -> new Transformer.Builder().setContainerMimeType(MimeTypes.VIDEO_FLV).build()); + () -> new Transformer.Builder().setOutputMimeType(MimeTypes.VIDEO_FLV).build()); } @Test