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

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

Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev

parents a4750fd7 ac76fa35

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21030,6 +21030,7 @@ package android.media { 
    field public static final java.lang.String KEY_DURATION = "durationUs";

    field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

    field public static final java.lang.String KEY_FRAME_RATE = "frame-rate";

    field public static final java.lang.String KEY_HDR_STATIC_INFO = "hdr-static-info";

    field public static final java.lang.String KEY_HEIGHT = "height";

    field public static final java.lang.String KEY_INTRA_REFRESH_PERIOD = "intra-refresh-period";

    field public static final java.lang.String KEY_IS_ADTS = "is-adts";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22522,6 +22522,7 @@ package android.media { 
    field public static final java.lang.String KEY_DURATION = "durationUs";

    field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

    field public static final java.lang.String KEY_FRAME_RATE = "frame-rate";

    field public static final java.lang.String KEY_HDR_STATIC_INFO = "hdr-static-info";

    field public static final java.lang.String KEY_HEIGHT = "height";

    field public static final java.lang.String KEY_INTRA_REFRESH_PERIOD = "intra-refresh-period";

    field public static final java.lang.String KEY_IS_ADTS = "is-adts";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21096,6 +21096,7 @@ package android.media { 
    field public static final java.lang.String KEY_DURATION = "durationUs";

    field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

    field public static final java.lang.String KEY_FRAME_RATE = "frame-rate";

    field public static final java.lang.String KEY_HDR_STATIC_INFO = "hdr-static-info";

    field public static final java.lang.String KEY_HEIGHT = "height";

    field public static final java.lang.String KEY_INTRA_REFRESH_PERIOD = "intra-refresh-period";

    field public static final java.lang.String KEY_IS_ADTS = "is-adts";

media/java/android/media/MediaFormat.java

+12 −0
Original line number Diff line number Diff line
@@ -644,6 +644,18 @@ public final class MediaFormat { 
    /** Full range. Y, Cr and Cb component values range from 0 to 255 for 8-bit content. */

    public static final int COLOR_RANGE_FULL = 1;



    /**

     * An optional key describing the static metadata of HDR (high-dynamic-range) video content.

     *

     * The associated value is a ByteBuffer. This buffer contains the raw contents of the

     * Static Metadata Descriptor (including the descriptor ID) of an HDMI Dynamic Range and

     * Mastering InfoFrame as defined by CTA-861.3. This key must be provided to video decoders

     * for HDR video content unless this information is contained in the bitstream and the video

     * decoder supports an HDR-capable profile. This key must be provided to video encoders for

     * HDR video content.

     */

    public static final String KEY_HDR_STATIC_INFO = "hdr-static-info";



    /**

     * A key describing a unique ID for the content of a media track.

     *