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

Miscalleneous small fixes in Transformer

Browse Source 
PiperOrigin-RevId: 388911857
This commit is contained in:
kimvde 2021-08-05 13:34:29 +01:00 committed by Christos Tsilopoulos
parent fc1db189f2
commit 9e798a647e
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Muxer.java
View File

@ -28,8 +28,8 @@ import java.nio.ByteBuffer;
* <p>Query whether {@link #supportsSampleMimeType(String) sample MIME types are supported} and * <p>Query whether {@link #supportsSampleMimeType(String) sample MIME types are supported} and
* {@link #addTrack(Format) add all tracks}, then {@link #writeSampleData(int, ByteBuffer, boolean, * {@link #addTrack(Format) add all tracks}, then {@link #writeSampleData(int, ByteBuffer, boolean,
* long) write sample data} to mux samples. Once any sample data has been written, it is not * long) write sample data} to mux samples. Once any sample data has been written, it is not
* possible to add tracks. After writing all sample data, {@link #release() release} the instance to * possible to add tracks. After writing all sample data, {@link #release(boolean) release} the
* finish writing to the output and return any resources to the system. * instance to finish writing to the output and return any resources to the system.
*/ */
/* package */ interface Muxer { /* package */ interface Muxer {

15
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
View File

@ -204,8 +204,10 @@ public final class Transformer {
} }
/** /**
* Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. Supported * Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. The
* values are: * output MIME type should be supported by the {@link
* Muxer.Factory#supportsOutputMimeType(String) muxer}. Values supported by the default {@link
* FrameworkMuxer} are:
* *
* <ul> * <ul>
* <li>{@link MimeTypes#VIDEO_MP4} * <li>{@link MimeTypes#VIDEO_MP4}
@ -261,7 +263,8 @@ public final class Transformer {
} }
/** /**
* Sets the factory for muxers that write the media container. * Sets the factory for muxers that write the media container. The default value is a {@link
* FrameworkMuxer.Factory}.
* *
* @param muxerFactory A {@link Muxer.Factory}. * @param muxerFactory A {@link Muxer.Factory}.
* @return This builder. * @return This builder.
@ -407,7 +410,8 @@ public final class Transformer {
* sources}, the highest bitrate video and audio streams are selected. * sources}, the highest 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. The supported sample formats depend on the
* output container format and are described in {@link MediaMuxer#addTrack(MediaFormat)}. * {@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.
@ -431,7 +435,8 @@ public final class Transformer {
* sources}, the highest bitrate video and audio streams are selected. * sources}, the highest 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. The supported sample formats depend on the
* output container format and are described in {@link MediaMuxer#addTrack(MediaFormat)}. * {@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

4
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
View File

@ -222,8 +222,8 @@ import java.nio.ByteBuffer;
} }
/** /**
* Attempts to process decoder output audio, and returns whether it may be possible to process * Attempts to process decoder output data, and returns whether it may be possible to process more
* more data immediately by calling this method again. * data immediately by calling this method again.
*/ */
private boolean drainDecoderToFeedSonic() { private boolean drainDecoderToFeedSonic() {
MediaCodecAdapterWrapper decoder = checkNotNull(this.decoder); MediaCodecAdapterWrapper decoder = checkNotNull(this.decoder);