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

Commit b29293f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaMuxer: Fix rendering issue in javadoc of addTrack" into main

parents a084fa1c d8a5d2a5

media/java/android/media/MediaMuxer.java

+14 −14
Original line number Diff line number Diff line
@@ -602,42 +602,42 @@ final public class MediaMuxer { 
     *   <tbody>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *     </tr>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *     </tr>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *     </tr>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *     </tr>

     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_VIDEO_MPEG4 MPEG-4}</td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *     </tr>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>
@@ -645,27 +645,27 @@ final public class MediaMuxer { 
     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis}</td>

     *       <td></td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td>21</td>

     *     </tr>

     *     <tr>

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

     *       <td></td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td>21</td>

     *     </tr>

     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_VIDEO_VP9 VP9}</td>

     *       <td></td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td>24</td>

     *     </tr>

     *     <tr>

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

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>24</td>
@@ -673,20 +673,20 @@ final public class MediaMuxer { 
     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_OPUS OPUS}</td>

     *       <td></td>

     *       <td>✓</td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td>&#x2713;</td>

     *       <td>26</td>

     *     </tr>

     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_VIDEO_AV1 AV1}</td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>31</td>

     *     </tr>

     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_VIDEO_DOLBY_VISION Dolby Vision}</td>

     *       <td>✓</td>

     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>32</td>