loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update javadoc to reflect removal of WebM container option

Browse Source 
It seems fine to remove the documentation about the WebM case now we are only supporting unfragmented MP4, so that new users coming to this API aren't confused about how to set the container MIME type.

PiperOrigin-RevId: 413611472
This commit is contained in:
andrewlewis 2021-12-02 09:07:39 +00:00 committed by tonihei
parent f1a5825d73
commit e077edded5
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -26,8 +26,6 @@ import static java.lang.Math.min;
import android.content.Context; import android.content.Context;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.media.MediaFormat;
import android.media.MediaMuxer;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
@ -300,19 +298,11 @@ public final class Transformer {
* input. Supported values are: * input. Supported values are:
* *
* <ul> * <ul>
* <li>when the container MIME type is {@link MimeTypes#VIDEO_MP4}:
* <ul>
* <li>{@link MimeTypes#VIDEO_H263} * <li>{@link MimeTypes#VIDEO_H263}
* <li>{@link MimeTypes#VIDEO_H264} * <li>{@link MimeTypes#VIDEO_H264}
* <li>{@link MimeTypes#VIDEO_H265} from API level 24 * <li>{@link MimeTypes#VIDEO_H265} from API level 24
* <li>{@link MimeTypes#VIDEO_MP4V} * <li>{@link MimeTypes#VIDEO_MP4V}
* </ul> * </ul>
* <li>when the container MIME type is {@link MimeTypes#VIDEO_WEBM}:
* <ul>
* <li>{@link MimeTypes#VIDEO_VP8}
* <li>{@link MimeTypes#VIDEO_VP9} from API level 24
* </ul>
* </ul>
* *
* @param videoMimeType The MIME type of the video samples in the output. * @param videoMimeType The MIME type of the video samples in the output.
* @return This builder. * @return This builder.
@ -327,17 +317,10 @@ public final class Transformer {
* input. Supported values are: * input. Supported values are:
* *
* <ul> * <ul>
* <li>when the container MIME type is {@link MimeTypes#VIDEO_MP4}:
* <ul>
* <li>{@link MimeTypes#AUDIO_AAC} * <li>{@link MimeTypes#AUDIO_AAC}
* <li>{@link MimeTypes#AUDIO_AMR_NB} * <li>{@link MimeTypes#AUDIO_AMR_NB}
* <li>{@link MimeTypes#AUDIO_AMR_WB} * <li>{@link MimeTypes#AUDIO_AMR_WB}
* </ul> * </ul>
* <li>when the container MIME type is {@link MimeTypes#VIDEO_WEBM}:
* <ul>
* <li>{@link MimeTypes#AUDIO_VORBIS}
* </ul>
* </ul>
* *
* @param audioMimeType The MIME type of the audio samples in the output. * @param audioMimeType The MIME type of the audio samples in the output.
* @return This builder. * @return This builder.
@ -406,7 +389,6 @@ public final class Transformer {
* @throws NullPointerException If the {@link Context} has not been provided. * @throws NullPointerException If the {@link Context} has not been provided.
* @throws IllegalStateException If both audio and video have been removed (otherwise the output * @throws IllegalStateException If both audio and video have been removed (otherwise the output
* would not contain any samples). * would not contain any samples).
* @throws IllegalStateException If the muxer doesn't support the requested container MIME type.
* @throws IllegalStateException If the muxer doesn't support the requested audio MIME type. * @throws IllegalStateException If the muxer doesn't support the requested audio MIME type.
* @throws IllegalStateException If the muxer doesn't support the requested video MIME type. * @throws IllegalStateException If the muxer doesn't support the requested video MIME type.
*/ */
@ -561,9 +543,7 @@ public final class Transformer {
* track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest
* bitrate video and audio streams are selected. * bitrate video and audio streams are selected.
* *
* @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * @param mediaItem The {@link MediaItem} to transform.
* {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are
* described in {@link MediaMuxer#addTrack(MediaFormat)}.
* @param path The path to the output file. * @param path The path to the output file.
* @throws IllegalArgumentException If the path is invalid. * @throws IllegalArgumentException If the path is invalid.
* @throws IllegalStateException If this method is called from the wrong thread. * @throws IllegalStateException If this method is called from the wrong thread.
@ -586,9 +566,7 @@ public final class Transformer {
* track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest * track types are ignored. For adaptive bitrate {@link MediaSource media sources}, the highest
* bitrate video and audio streams are selected. * bitrate video and audio streams are selected.
* *
* @param mediaItem The {@link MediaItem} to transform. The supported sample formats depend on the * @param mediaItem The {@link MediaItem} to transform.
* {@link Muxer} and on the output container format. For the {@link FrameworkMuxer}, they are
* described in {@link MediaMuxer#addTrack(MediaFormat)}.
* @param parcelFileDescriptor A readable and writable {@link ParcelFileDescriptor} of the output. * @param parcelFileDescriptor A readable and writable {@link ParcelFileDescriptor} of the output.
* The file referenced by this ParcelFileDescriptor should not be used before the * The file referenced by this ParcelFileDescriptor should not be used before the
* transformation is completed. It is the responsibility of the caller to close the * transformation is completed. It is the responsibility of the caller to close the