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

Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev

Browse Source
This commit is contained in:
Lajos Molnar
2016-03-11 01:44:56 +00:00
committed by Android (Google) Code Review
parent 79c1bc8434 b12d49bb1e
commit 684aff1fce
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,10 @@
package android.media; package android.media;
import android.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -606,6 +610,16 @@ public final class MediaFormat {
/** BT.2020 color chromacity coordinates with KR = 0.2627, KB = 0.0593. */ /** BT.2020 color chromacity coordinates with KR = 0.2627, KB = 0.0593. */
public static final int COLOR_STANDARD_BT2020 = 6; public static final int COLOR_STANDARD_BT2020 = 6;
/** @hide */
@IntDef({
COLOR_STANDARD_BT709,
COLOR_STANDARD_BT601_PAL,
COLOR_STANDARD_BT601_NTSC,
COLOR_STANDARD_BT2020,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ColorStandard {}
/** /**
* An optional key describing the opto-electronic transfer function used * An optional key describing the opto-electronic transfer function used
* for the video content. * for the video content.
@@ -628,6 +642,16 @@ public final class MediaFormat {
/** ARIB STD-B67 hybrid-log-gamma transfer function. This is used by some HDR video content. */ /** ARIB STD-B67 hybrid-log-gamma transfer function. This is used by some HDR video content. */
public static final int COLOR_TRANSFER_HLG = 7; public static final int COLOR_TRANSFER_HLG = 7;
/** @hide */
@IntDef({
COLOR_TRANSFER_LINEAR,
COLOR_TRANSFER_SDR_VIDEO,
COLOR_TRANSFER_ST2084,
COLOR_TRANSFER_HLG,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ColorTransfer {}
/** /**
* An optional key describing the range of the component values of the video content. * An optional key describing the range of the component values of the video content.
* *
@@ -644,6 +668,14 @@ public final class MediaFormat {
/** Full range. Y, Cr and Cb component values range from 0 to 255 for 8-bit content. */ /** 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; public static final int COLOR_RANGE_FULL = 1;
/** @hide */
@IntDef({
COLOR_RANGE_LIMITED,
COLOR_RANGE_FULL,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ColorRange {}
/** /**
* An optional key describing the static metadata of HDR (high-dynamic-range) video content. * An optional key describing the static metadata of HDR (high-dynamic-range) video content.
* *