Merge "Update DataSpace.aidl RANGE_EXTENDED" into udc-dev (cce0903b) · Commits · e / os / android_hardware_interfaces

graphics/common/aidl/android/hardware/graphics/common/Dataspace.aidl

+26 −24

Original line number	Diff line number	Diff line
		@@ -377,11 +377,19 @@ enum Dataspace {
		RANGE_LIMITED = 2 << 27, // 2 << RANGE_SHIFT = 0x10000000

		/**
		* Extended range is used for scRGB. Intended for use with
		* floating point pixel formats. [0.0 - 1.0] is the standard
		* sRGB space. Values outside the range 0.0 - 1.0 can encode
		* color outside the sRGB gamut.
		* Extended range can be used in combination with FP16 to communicate scRGB or with
		* SurfaceControl's setExtendedRangeBrightness(SurfaceControl, float, float)
		* to indicate an HDR range.
		*
		* When used with floating point pixel formats and #STANDARD_BT709 then [0.0 - 1.0] is the
		* standard sRGB space and values outside the range [0.0 - 1.0] can encode
		* color outside the sRGB gamut. [-0.5, 7.5] is the standard scRGB range.
		* Used to blend/merge multiple dataspaces on a single display.
		*
		* As of Android U in combination with composer3's mixed SDR/HDR feature then this may
		* be combined with SurfaceControl's setExtendedRangeBrightness(SurfaceControl, float, float)
		* and other formats such as RGBA_8888 or RGBA_1010102 to communicate a variable HDR
		* brightness range, which in turn will influence that layer's dimming ratio when composited
		*/
		RANGE_EXTENDED = 3 << 27, // 3 << RANGE_SHIFT = 0x18000000

		@@ -397,7 +405,6 @@ enum Dataspace {
		*/
		SRGB_LINEAR = 1 << 16 \| 1 << 22 \| 1 << 27, // STANDARD_BT709 \| TRANSFER_LINEAR \| RANGE_FULL


		/**
		* scRGB linear encoding:
		*
		@@ -412,7 +419,6 @@ enum Dataspace {
		*/
		SCRGB_LINEAR = 1 << 16 \| 1 << 22 \| 3 << 27, // STANDARD_BT709 \| TRANSFER_LINEAR \| RANGE_EXTENDED


		/**
		* sRGB gamma encoding:
		*
		@@ -428,7 +434,6 @@ enum Dataspace {
		*/
		SRGB = 1 << 16 \| 2 << 22 \| 1 << 27, // STANDARD_BT709 \| TRANSFER_SRGB \| RANGE_FULL


		/**
		* scRGB:
		*
		@@ -470,8 +475,8 @@ enum Dataspace {
		*
		* Use limited range, SMPTE 170M transfer and BT.601_625 standard.
		*/
		BT601_625 = 2 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT601_625 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED

		BT601_625 =
		2 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT601_625 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED

		/**
		* ITU-R Recommendation 601 (BT.601) - 525-line
		@@ -480,7 +485,8 @@ enum Dataspace {
		*
		* Use limited range, SMPTE 170M transfer and BT.601_525 standard.
		*/
		BT601_525 = 4 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT601_525 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED
		BT601_525 =
		4 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT601_525 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED

		/**
		* ITU-R Recommendation 709 (BT.709)
		@@ -491,7 +497,6 @@ enum Dataspace {
		*/
		BT709 = 1 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT709 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED


		/**
		* SMPTE EG 432-1 and SMPTE RP 431-2.
		*
		@@ -501,7 +506,6 @@ enum Dataspace {
		*/
		DCI_P3_LINEAR = 10 << 16 \| 1 << 22 \| 1 << 27, // STANDARD_DCI_P3 \| TRANSFER_LINEAR \| RANGE_FULL


		/**
		* SMPTE EG 432-1 and SMPTE RP 431-2.
		*
		@@ -513,15 +517,14 @@ enum Dataspace {
		*/
		DCI_P3 = 10 << 16 \| 5 << 22 \| 1 << 27, // STANDARD_DCI_P3 \| TRANSFER_GAMMA2_6 \| RANGE_FULL


		/**
		* Display P3
		*
		* Display P3 uses same primaries and white-point as DCI-P3
		* linear transfer function makes this the same as DCI_P3_LINEAR.
		*/
		DISPLAY_P3_LINEAR = 10 << 16 \| 1 << 22 \| 1 << 27, // STANDARD_DCI_P3 \| TRANSFER_LINEAR \| RANGE_FULL

		DISPLAY_P3_LINEAR =
		10 << 16 \| 1 << 22 \| 1 << 27, // STANDARD_DCI_P3 \| TRANSFER_LINEAR \| RANGE_FULL

		/**
		* Display P3
		@@ -531,7 +534,6 @@ enum Dataspace {
		*/
		DISPLAY_P3 = 10 << 16 \| 2 << 22 \| 1 << 27, // STANDARD_DCI_P3 \| TRANSFER_SRGB \| RANGE_FULL


		/**
		* Adobe RGB
		*
		@@ -541,7 +543,6 @@ enum Dataspace {
		*/
		ADOBE_RGB = 11 << 16 \| 4 << 22 \| 1 << 27, // STANDARD_ADOBE_RGB \| TRANSFER_GAMMA2_2 \| RANGE_FULL


		/**
		* ITU-R Recommendation 2020 (BT.2020)
		*
		@@ -551,7 +552,6 @@ enum Dataspace {
		*/
		BT2020_LINEAR = 6 << 16 \| 1 << 22 \| 1 << 27, // STANDARD_BT2020 \| TRANSFER_LINEAR \| RANGE_FULL


		/**
		* ITU-R Recommendation 2020 (BT.2020)
		*
		@@ -570,7 +570,6 @@ enum Dataspace {
		*/
		BT2020_PQ = 6 << 16 \| 7 << 22 \| 1 << 27, // STANDARD_BT2020 \| TRANSFER_ST2084 \| RANGE_FULL


		/**
		* Data spaces for non-color formats
		*/
		@@ -611,7 +610,8 @@ enum Dataspace {
		*
		* Use limited range, SMPTE 170M transfer and BT2020 standard
		*/
		BT2020_ITU = 6 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT2020 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED
		BT2020_ITU =
		6 << 16 \| 3 << 22 \| 2 << 27, // STANDARD_BT2020 \| TRANSFER_SMPTE_170M \| RANGE_LIMITED

		/**
		* ITU-R Recommendation 2100 (BT.2100)
		@@ -621,7 +621,8 @@ enum Dataspace {
		* Use limited/full range, PQ/HLG transfer, and BT2020 standard
		* limited range is the preferred / normative definition for BT.2100
		*/
		BT2020_ITU_PQ = 6 << 16 \| 7 << 22 \| 2 << 27, // STANDARD_BT2020 \| TRANSFER_ST2084 \| RANGE_LIMITED
		BT2020_ITU_PQ =
		6 << 16 \| 7 << 22 \| 2 << 27, // STANDARD_BT2020 \| TRANSFER_ST2084 \| RANGE_LIMITED
		BT2020_ITU_HLG = 6 << 16 \| 8 << 22 \| 2 << 27, // STANDARD_BT2020 \| TRANSFER_HLG \| RANGE_LIMITED
		BT2020_HLG = 6 << 16 \| 8 << 22 \| 1 << 27, // STANDARD_BT2020 \| TRANSFER_HLG \| RANGE_FULL

		@@ -687,5 +688,6 @@ enum Dataspace {
		*
		* Use full range, SMPTE 170M transfer and BT.709 standard.
		*/
		BT709_FULL_RANGE = 1 << 16 \| 3 << 22 \| 1 << 27, // STANDARD_BT709 \| TRANSFER_SMPTE_170M \| RANGE_FULL
		BT709_FULL_RANGE =
		1 << 16 \| 3 << 22 \| 1 << 27, // STANDARD_BT709 \| TRANSFER_SMPTE_170M \| RANGE_FULL
		}