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

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

Merge "MediaMuxer: Update SDK version of codec in javadoc of addTrack" into main

parents 473bf695 06da849a

media/java/android/media/MediaMuxer.java

+11 −11
Original line number Diff line number Diff line
@@ -605,42 +605,42 @@ final public class MediaMuxer { 
     *       <td>&#x2713;</td>

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

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

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

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

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

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

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

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

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

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

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

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

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

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

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

     *       <td></td>

     *       <td></td>

     *       <td>17</td>

     *       <td>16</td>

     *     </tr>

     *     <tr>

     *       <td>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis}</td>
@@ -675,21 +675,21 @@ final public class MediaMuxer { 
     *       <td></td>

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

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

     *       <td>26</td>

     *       <td>29</td>

     *     </tr>

     *     <tr>

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

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

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

     *       <td></td>

     *       <td></td>

     *       <td>31</td>

     *       <td>33</td>

     *     </tr>

     *     <tr>

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

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

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

     *       <td></td>

     *       <td></td>

     *       <td>32</td>

     *       <td>34</td>

     *     </tr>

     *   </tbody>

     * </table>