Merge "Update javadoc for AddTrack method" into main (df8e2cba) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaMuxer.java

+102 −39

Original line number	Diff line number	Diff line
		@@ -586,41 +586,104 @@ final public class MediaMuxer {
		* <table>
		* <thead>
		* <tr>
		* <th rowspan=2>OS Version(s)</th>
		* <td colspan=3>Codec support</th>
		* </tr><tr>
		* <th>Codec</th>
		* <th>{@linkplain OutputFormat#MUXER_OUTPUT_MPEG_4 MP4}</th>
		* <th>{@linkplain OutputFormat#MUXER_OUTPUT_WEBM WEBM}</th>
		* <th>{@linkplain OutputFormat#MUXER_OUTPUT_OGG OGG}</th>
		* <th>Supported From SDK version</th>
		* </tr>
		* </thead>
		* <tbody>
		* <tr>
		* <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}</td>
		* <td rowspan=6>{@link MediaFormat#MIMETYPE_AUDIO_AAC AAC},<br>
		* {@link MediaFormat#MIMETYPE_AUDIO_AMR_NB NB-AMR},<br>
		* {@link MediaFormat#MIMETYPE_AUDIO_AMR_WB WB-AMR},<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_H263 H.263},<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_MPEG4 MPEG-4},<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_AVC AVC} (H.264)</td>
		* <td rowspan=3>Not supported</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>
		* <td rowspan=3>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis},<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_VP8 VP8}</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#M}</td>
		* </tr><tr>
		* <td>{@link android.os.Build.VERSION_CODES#N}</td>
		* <td>as above, plus<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_HEVC HEVC} (H.265)</td>
		* <td>as above, plus<br>
		* {@link MediaFormat#MIMETYPE_VIDEO_VP9 VP9}</td>
		* <td>{@link MediaFormat#MIMETYPE_AUDIO_AAC AAC}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_AUDIO_AMR_NB NB-AMR}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_AUDIO_AMR_WB WB-AMR}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_H263 H.263}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_MPEG4 MPEG-4}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_AVC AVC} (H.264)</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>17</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis}</td>
		* <td></td>
		* <td>✓</td>
		* <td></td>
		* <td>21</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_VP8 VP8}</td>
		* <td></td>
		* <td>✓</td>
		* <td></td>
		* <td>21</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_VP9 VP9}</td>
		* <td></td>
		* <td>✓</td>
		* <td></td>
		* <td>24</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_HEVC HEVC} (H.265)</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>24</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_AUDIO_OPUS OPUS}</td>
		* <td></td>
		* <td>✓</td>
		* <td>✓</td>
		* <td>26</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_AV1 AV1}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>31</td>
		* </tr>
		* <tr>
		* <td>{@link MediaFormat#MIMETYPE_VIDEO_DOLBY_VISION Dolby Vision}</td>
		* <td>✓</td>
		* <td></td>
		* <td></td>
		* <td>32</td>
		* </tr>
		* </tbody>
		* </table>