Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81f63c1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for AddTrack method" into main am: df8e2cba am: 60158a9f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3296531



Change-Id: I21bfb58fab8b224ba62f54bb29dd33e57a390d28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71290fba 60158a9f

media/java/android/media/MediaMuxer.java

+102 −39
Original line number Original line Diff line number Diff line
@@ -586,41 +586,104 @@ final public class MediaMuxer { 
     * <table>

     * <table>

     *   <thead>

     *   <thead>

     *     <tr>

     *     <tr>

     *    <th rowspan=2>OS Version(s)</th>

     *       <th>Codec</th>

     *    <td colspan=3>Codec support</th>

     *   </tr><tr>

     *       <th>{@linkplain OutputFormat#MUXER_OUTPUT_MPEG_4 MP4}</th>

     *       <th>{@linkplain OutputFormat#MUXER_OUTPUT_MPEG_4 MP4}</th>

     *       <th>{@linkplain OutputFormat#MUXER_OUTPUT_WEBM WEBM}</th>

     *       <th>{@linkplain OutputFormat#MUXER_OUTPUT_WEBM WEBM}</th>

     *       <th>{@linkplain OutputFormat#MUXER_OUTPUT_OGG OGG}</th>

     *       <th>Supported From SDK version</th>

     *     </tr>

     *     </tr>

     *   </thead>

     *   </thead>

     *   <tbody>

     *   <tbody>

     *     <tr>

     *     <tr>

     *    <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}</td>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_AAC AAC}</td>

     *    <td rowspan=6>{@link MediaFormat#MIMETYPE_AUDIO_AAC AAC},<br>

     *       <td>✓</td>

     *        {@link MediaFormat#MIMETYPE_AUDIO_AMR_NB NB-AMR},<br>

     *       <td></td>

     *        {@link MediaFormat#MIMETYPE_AUDIO_AMR_WB WB-AMR},<br>

     *       <td></td>

     *        {@link MediaFormat#MIMETYPE_VIDEO_H263 H.263},<br>

     *       <td>17</td>

     *        {@link MediaFormat#MIMETYPE_VIDEO_MPEG4 MPEG-4},<br>

     *     </tr>

     *        {@link MediaFormat#MIMETYPE_VIDEO_AVC AVC} (H.264)</td>

     *     <tr>

     *    <td rowspan=3>Not supported</td>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_AMR_NB NB-AMR}</td>

     *   </tr><tr>

     *       <td>✓</td>

     *    <td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>

     *       <td></td>

     *   </tr><tr>

     *       <td></td>

     *    <td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>

     *       <td>17</td>

     *   </tr><tr>

     *     </tr>

     *    <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>

     *     <tr>

     *    <td rowspan=3>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis},<br>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_AMR_WB WB-AMR}</td>

     *        {@link MediaFormat#MIMETYPE_VIDEO_VP8 VP8}</td>

     *       <td>✓</td>

     *   </tr><tr>

     *       <td></td>

     *    <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>

     *       <td></td>

     *   </tr><tr>

     *       <td>17</td>

     *    <td>{@link android.os.Build.VERSION_CODES#M}</td>

     *     </tr>

     *   </tr><tr>

     *     <tr>

     *    <td>{@link android.os.Build.VERSION_CODES#N}</td>

     *       <td>{@link MediaFormat#MIMETYPE_VIDEO_H263 H.263}</td>

     *    <td>as above, plus<br>

     *       <td>✓</td>

     *        {@link MediaFormat#MIMETYPE_VIDEO_HEVC HEVC} (H.265)</td>

     *       <td></td>

     *    <td>as above, plus<br>

     *       <td></td>

     *        {@link MediaFormat#MIMETYPE_VIDEO_VP9 VP9}</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>

     *     </tr>

     *   </tbody>

     *   </tbody>

     * </table>

     * </table>