diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 12 |
4 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index cc386db74ef4..cc8b799d15db 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20983,6 +20983,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 7823b3cd16ba..e79f0def5df1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22475,6 +22475,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"; diff --git a/api/test-current.txt b/api/test-current.txt index a478793a70bf..aff053cba9e0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20994,6 +20994,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index a0e2481d4fdc..12bfac0ccac1 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -645,6 +645,18 @@ public final class MediaFormat { 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. * * <p>This key is used by {@link MediaExtractor}. Some extractors provide multiple encodings |