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

Commit 931ae62f authored by Lajos Molnar's avatar Lajos Molnar
Browse files

media: unhide and document already used fields 

Bug: 18134807
Bug: 19300915
Bug: 11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
parent b33d878d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -15828,6 +15828,7 @@ package android.media { 
    field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";

    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_LEVEL = "level";

    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";
@@ -15837,7 +15838,10 @@ package android.media { 
    field public static final java.lang.String KEY_PROFILE = "profile";

    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";

    field public static final java.lang.String KEY_ROTATION = "rotation-degrees";

    field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate";

    field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";

    field public static final java.lang.String KEY_STRIDE = "stride";

    field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -17042,6 +17042,7 @@ package android.media { 
    field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";

    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_LEVEL = "level";

    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";
@@ -17051,7 +17052,10 @@ package android.media { 
    field public static final java.lang.String KEY_PROFILE = "profile";

    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";

    field public static final java.lang.String KEY_ROTATION = "rotation-degrees";

    field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate";

    field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";

    field public static final java.lang.String KEY_STRIDE = "stride";

    field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

media/java/android/media/MediaFormat.java

+38 −3
Original line number Diff line number Diff line
@@ -232,11 +232,22 @@ public final class MediaFormat { 
    public static final String KEY_TEMPORAL_LAYERING = "ts-schema";



    /**

     * @hide

     * A key describing the stride of the video bytebuffer layout.

     * Stride (or row increment) is the difference between the index of a pixel

     * and that of the pixel directly underneath. For YUV 420 formats, the

     * stride corresponds to the Y plane; the stride of the U and V planes can

     * be calculated based on the color format.

     * The associated value is an integer, representing number of bytes.

     */

    public static final String KEY_STRIDE = "stride";



    /**

     * @hide

     * A key describing the plane height of a multi-planar (YUV) video bytebuffer layout.

     * Slice height (or plane height) is the number of rows that must be skipped to get

     * from the top of the Y plane to the top of the U plane in the bytebuffer. In essence

     * the offset of the U plane is sliceHeight * stride. The height of the U/V planes

     * can be calculated based on the color format.

     * The associated value is an integer, representing number of rows.

     */

    public static final String KEY_SLICE_HEIGHT = "slice-height";
@@ -456,13 +467,37 @@ public final class MediaFormat { 


    /**

     * A key describing the desired profile to be used by an encoder.

     * The associated value is an integer.

     * Constants are declared in {@link MediaCodecInfo.CodecProfileLevel}.

     * This key is only supported for codecs that specify a profile.

     * This key is used as a hint, and is only supported for codecs

     * that specify a profile.

     *

     * @see MediaCodecInfo.CodecCapabilities#profileLevels

     */

    public static final String KEY_PROFILE = "profile";



    /**

     * A key describing the desired profile to be used by an encoder.

     * The associated value is an integer.

     * Constants are declared in {@link MediaCodecInfo.CodecProfileLevel}.

     * This key is used as a further hint when specifying a desired profile,

     * and is only supported for codecs that specify a level.

     * <p>

     * This key is ignored if the {@link #KEY_PROFILE profile} is not specified.

     *

     * @see MediaCodecInfo.CodecCapabilities#profileLevels

     */

    public static final String KEY_LEVEL = "level";



    /**

     * A key describing the desired clockwise rotation on an output surface.

     * This key is only used when the codec is configured using an output surface.

     * The associated value is an integer, representing degrees.

     *

     * @see MediaCodecInfo.CodecCapabilities#profileLevels

     */

    public static final String KEY_ROTATION = "rotation-degrees";



    /**

     * A key describing the desired bitrate mode to be used by an encoder.

     * Constants are declared in {@link MediaCodecInfo.CodecCapabilities}.