Merge "Modifying Dataspace.aidl to add additional HAL_ Datapoints present in graphics/**/swapchain.cpp" into main

This commit is contained in:
Sergiu Ferentz 2023-10-09 08:27:26 +00:00 committed by Android (Google) Code Review
commit d2075f0d14
2 changed files with 18 additions and 0 deletions

View file

@ -81,9 +81,11 @@ enum Dataspace {
DISPLAY_P3_LINEAR = (((10 << 16) | (1 << 22)) | (1 << 27)) /* 139067392 */, DISPLAY_P3_LINEAR = (((10 << 16) | (1 << 22)) | (1 << 27)) /* 139067392 */,
DISPLAY_P3 = (((10 << 16) | (2 << 22)) | (1 << 27)) /* 143261696 */, DISPLAY_P3 = (((10 << 16) | (2 << 22)) | (1 << 27)) /* 143261696 */,
ADOBE_RGB = (((11 << 16) | (4 << 22)) | (1 << 27)) /* 151715840 */, ADOBE_RGB = (((11 << 16) | (4 << 22)) | (1 << 27)) /* 151715840 */,
ADOBE_RGB_LINEAR = (((11 << 16) | (1 << 22)) | (1 << 27)) /* 139132928 */,
BT2020_LINEAR = (((6 << 16) | (1 << 22)) | (1 << 27)) /* 138805248 */, BT2020_LINEAR = (((6 << 16) | (1 << 22)) | (1 << 27)) /* 138805248 */,
BT2020 = (((6 << 16) | (3 << 22)) | (1 << 27)) /* 147193856 */, BT2020 = (((6 << 16) | (3 << 22)) | (1 << 27)) /* 147193856 */,
BT2020_PQ = (((6 << 16) | (7 << 22)) | (1 << 27)) /* 163971072 */, BT2020_PQ = (((6 << 16) | (7 << 22)) | (1 << 27)) /* 163971072 */,
BT2020_LINEAR_EXTENDED = (((6 << 16) | (1 << 22)) | (3 << 27)) /* 407240704 */,
DEPTH = 0x1000, DEPTH = 0x1000,
SENSOR = 0x1001, SENSOR = 0x1001,
BT2020_ITU = (((6 << 16) | (3 << 22)) | (2 << 27)) /* 281411584 */, BT2020_ITU = (((6 << 16) | (3 << 22)) | (2 << 27)) /* 281411584 */,

View file

@ -558,6 +558,13 @@ enum Dataspace {
*/ */
ADOBE_RGB = 11 << 16 | 4 << 22 | 1 << 27, // STANDARD_ADOBE_RGB | TRANSFER_GAMMA2_2 | RANGE_FULL ADOBE_RGB = 11 << 16 | 4 << 22 | 1 << 27, // STANDARD_ADOBE_RGB | TRANSFER_GAMMA2_2 | RANGE_FULL
/**
* Adobe RGB LINEAR
*
* Use full range, linear transfer and Adobe RGB primaries
*/
ADOBE_RGB_LINEAR = 11 << 16 | 1 << 22 | 1 << 27, // STANDARD_ADOBE_RGB | TRANSFER_LINEAR | RANGE_FULL
/** /**
* ITU-R Recommendation 2020 (BT.2020) * ITU-R Recommendation 2020 (BT.2020)
* *
@ -585,6 +592,15 @@ enum Dataspace {
*/ */
BT2020_PQ = 6 << 16 | 7 << 22 | 1 << 27, // STANDARD_BT2020 | TRANSFER_ST2084 | RANGE_FULL BT2020_PQ = 6 << 16 | 7 << 22 | 1 << 27, // STANDARD_BT2020 | TRANSFER_ST2084 | RANGE_FULL
/**
* ITU-R Recommendation 2020 (BT.2020)
*
* Ultra High-definition television
*
* Use extended range, linear transfer and BT2020 standard
*/
BT2020_LINEAR_EXTENDED = 6 << 16 | 1 << 22 | 3 << 27, // STANDARD_BT2020 | TRANSFER_LINEAR | RANGE_EXTENDED
/** /**
* Data spaces for non-color formats * Data spaces for non-color formats
*/ */