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

Commit 03cd51cd authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev

parents 95a18139 9a4575c3

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12753,7 +12753,9 @@ package android.media { 
    field public static final java.lang.String KEY_IS_ADTS = "is-adts";

    field public static final java.lang.String KEY_I_FRAME_INTERVAL = "i-frame-interval";

    field public static final java.lang.String KEY_LANGUAGE = "language";

    field public static final java.lang.String KEY_MAX_HEIGHT = "max-height";

    field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

    field public static final java.lang.String KEY_MAX_WIDTH = "max-width";

    field public static final java.lang.String KEY_MIME = "mime";

    field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";

    field public static final java.lang.String KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after";

media/java/android/media/MediaFormat.java

+24 −0
Original line number Diff line number Diff line
@@ -44,9 +44,19 @@ import java.util.Map; 
 *         for encoders, readable in the output format of decoders</b></td></tr>

 * <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td><b>encoder-only</b></td></tr>

 * <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr>

 * <tr><td>{@link #KEY_MAX_WIDTH}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution width</td></tr>

 * <tr><td>{@link #KEY_MAX_HEIGHT}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution height</td></tr>

 * <tr><td>{@link #KEY_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>video encoder in surface-mode only</b></td></tr>

 * <tr><td>{@link #KEY_PUSH_BLANK_BUFFERS_ON_STOP}</td><td>Integer(1)</td><td><b>video decoder rendering to a surface only</b></td></tr>

 * </table>

 * Specify both {@link #KEY_MAX_WIDTH} and {@link #KEY_MAX_HEIGHT} to enable

 * adaptive playback (seamless resolution change) for a video decoder that

 * supports it ({@link MediaCodecInfo.CodecCapabilities#FEATURE_AdaptivePlayback}).

 * The values are used as hints for the codec: they are the maximum expected

 * resolution to prepare for.  Depending on codec support, preparing for larger

 * maximum resolution may require more memory even if that resolution is never

 * reached.  These fields have no effect for codecs that do not support adaptive

 * playback.<br /><br />

 *

 * Audio formats have the following keys:

 * <table>
@@ -104,6 +114,20 @@ public final class MediaFormat { 
     */

    public static final String KEY_HEIGHT = "height";



    /**

     * A key describing the maximum expected width of the content in a video

     * decoder format, in case there are resolution changes in the video content.

     * The associated value is an integer

     */

    public static final String KEY_MAX_WIDTH = "max-width";



    /**

     * A key describing the maximum expected height of the content in a video

     * decoder format, in case there are resolution changes in the video content.

     * The associated value is an integer

     */

    public static final String KEY_MAX_HEIGHT = "max-height";



    /** A key describing the maximum size in bytes of a buffer of data

     * described by this MediaFormat.

     * The associated value is an integer