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

Commit f80afd79 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event"

parents 85d28a00 15a89e6b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11401,6 +11401,7 @@ package android.media { 
    field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322

    field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321

    field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1

    field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3

    field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc

    field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

    field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1

media/java/android/media/MediaPlayer.java

+6 −0
Original line number Diff line number Diff line
@@ -2319,6 +2319,11 @@ public class MediaPlayer 
     */

    public static final int MEDIA_INFO_STARTED_AS_NEXT = 2;



    /** The player just pushed the very first video frame for rendering.

     * @see android.media.MediaPlayer.OnInfoListener

     */

    public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3;



    /** The video is too complex for the decoder: it can't decode frames fast

     *  enough. Possibly only the audio plays fine at this stage.

     * @see android.media.MediaPlayer.OnInfoListener
@@ -2374,6 +2379,7 @@ public class MediaPlayer 
         * <ul>

         * <li>{@link #MEDIA_INFO_UNKNOWN}

         * <li>{@link #MEDIA_INFO_VIDEO_TRACK_LAGGING}

         * <li>{@link #MEDIA_INFO_VIDEO_RENDERING_START}

         * <li>{@link #MEDIA_INFO_BUFFERING_START}

         * <li>{@link #MEDIA_INFO_BUFFERING_END}

         * <li>{@link #MEDIA_INFO_BAD_INTERLEAVING}