Merge "media: expose media format keys for color characteristics" (58ec1b5a) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -20483,6 +20483,16 @@ package android.media {
		method public final void setInteger(java.lang.String, int);
		method public final void setLong(java.lang.String, long);
		method public final void setString(java.lang.String, java.lang.String);
		field public static final int COLOR_RANGE_FULL = 1; // 0x1
		field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
		field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
		field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
		field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
		field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
		field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
		field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
		field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
		field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
		field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
		field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
		field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
		@@ -20498,6 +20508,9 @@ package android.media {
		field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
		field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
		field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
		field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
		field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
		field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
		field public static final java.lang.String KEY_COMPLEXITY = "complexity";
		field public static final java.lang.String KEY_DURATION = "durationUs";
		field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

api/system-current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -21834,6 +21834,16 @@ package android.media {
		method public final void setInteger(java.lang.String, int);
		method public final void setLong(java.lang.String, long);
		method public final void setString(java.lang.String, java.lang.String);
		field public static final int COLOR_RANGE_FULL = 1; // 0x1
		field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
		field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
		field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
		field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
		field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
		field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
		field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
		field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
		field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
		field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
		field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
		field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
		@@ -21849,6 +21859,9 @@ package android.media {
		field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
		field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
		field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
		field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
		field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
		field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
		field public static final java.lang.String KEY_COMPLEXITY = "complexity";
		field public static final java.lang.String KEY_DURATION = "durationUs";
		field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

api/test-current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -20491,6 +20491,16 @@ package android.media {
		method public final void setInteger(java.lang.String, int);
		method public final void setLong(java.lang.String, long);
		method public final void setString(java.lang.String, java.lang.String);
		field public static final int COLOR_RANGE_FULL = 1; // 0x1
		field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
		field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
		field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
		field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
		field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
		field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
		field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
		field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
		field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
		field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
		field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
		field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
		@@ -20506,6 +20516,9 @@ package android.media {
		field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
		field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
		field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
		field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
		field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
		field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
		field public static final java.lang.String KEY_COMPLEXITY = "complexity";
		field public static final java.lang.String KEY_DURATION = "durationUs";
		field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

media/java/android/media/MediaFormat.java

+60 −0

Original line number	Diff line number	Diff line
		@@ -563,6 +563,66 @@ public final class MediaFormat {
		/** @hide */
		public static final String KEY_IS_TIMED_TEXT = "is-timed-text";

		// The following color aspect values must be in sync with the ones in HardwareAPI.h.
		/*
		* An optional key describing the color primaries, white point and
		* luminance factors for video content.
		*
		* The associated value is an integer: 0 if unspecified, or one of the
		* COLOR_STANDARD_ values.
		*/
		public static final String KEY_COLOR_STANDARD = "color-standard";

		/** BT.709 color chromacity coordinates with KR = 0.2126, KB = 0.0722. */
		public static final int COLOR_STANDARD_BT709 = 1;

		/** BT.601 625 color chromacity coordinates with KR = 0.299, KB = 0.114. */
		public static final int COLOR_STANDARD_BT601_PAL = 2;

		/** BT.601 525 color chromacity coordinates with KR = 0.299, KB = 0.114. */
		public static final int COLOR_STANDARD_BT601_NTSC = 4;

		/** BT.2020 color chromacity coordinates with KR = 0.2627, KB = 0.0593. */
		public static final int COLOR_STANDARD_BT2020 = 6;

		/**
		* An optional key describing the opto-electronic transfer function used
		* for the video content.
		*
		* The associated value is an integer: 0 if unspecified, or one of the
		* COLOR_TRANSFER_ values.
		*/
		public static final String KEY_COLOR_TRANSFER = "color-transfer";

		/** Linear transfer characteristic curve. */
		public static final int COLOR_TRANSFER_LINEAR = 1;

		/** SMPTE 170M transfer characteristic curve used by BT.601/BT.709/BT.2020. This is the curve
		* used by most non-HDR video content. */
		public static final int COLOR_TRANSFER_SDR_VIDEO = 3;

		/** SMPTE ST 2084 transfer function. This is used by some HDR video content. */
		public static final int COLOR_TRANSFER_ST2084 = 6;

		/** ARIB STD-B67 hybrid-log-gamma transfer function. This is used by some HDR video content. */
		public static final int COLOR_TRANSFER_HLG = 7;

		/**
		* An optional key describing the range of the component values of the video content.
		*
		* The associated value is an integer: 0 if unspecified, or one of the
		* COLOR_RANGE_ values.
		*/
		public static final String KEY_COLOR_RANGE = "color-range";

		/** Limited range. Y component values range from 16 to 235 for 8-bit content.
		* Cr, Cy values range from 16 to 240 for 8-bit content.
		* This is the default for video content. */
		public static final int COLOR_RANGE_LIMITED = 2;

		/** 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;

		/* package private */ MediaFormat(Map<String, Object> map) {
		mMap = map;
		}