Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lajos Molnar
2016-03-11 01:44:26 +00:00
committed by Android (Google) Code Review
parent a4750fd71d ac76fa3581
commit 79c1bc8434
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

1
api/system-current.txt
View File

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

1
api/test-current.txt
View File

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

12
media/java/android/media/MediaFormat.java
View File

@@ -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.
*