tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "graphics: polish Transform docs and indent ColorMode" into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-05-01 21:09:36 +00:00 committed by Android (Google) Code Review
commit 76061d7881
2 changed files with 213 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
current.txt
View file

@ -98,7 +98,7 @@ bd366b83d8d565d0e8bfabff3adfcab0259d75b4e2a9f8e1b91e11d1593a2ffb android.hardwar
17971eb8a482893dadcfc16e0583f492d42a034ef95d9b0b709417af30838396 android.hardware.graphics.allocator@2.0::IAllocator
60bf42a4898e4fb70dbd720b263aeafd7f35f5e1a5effeabb4d5d659878a5f18 android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer
b8a75617b9ec12bea641f3a73d4025a33e8b9a2f9169dd46094af56adf9249c5 android.hardware.graphics.bufferqueue@1.0::IProducerListener
862cd4c41884b6c06d843b88061a021ed117e751b60b8efe8916eb64a0b3c062 android.hardware.graphics.common@1.0::types
4f6dedbcdd21c309dfc650acea81a096d6b242493ffe49c8d61bd3c43aad354e android.hardware.graphics.common@1.0::types
b3aac6c3817f039964fcd62268274b3039e17bd7d0d5b40b4d1d1c7b19a1f866 android.hardware.graphics.composer@2.1::IComposer
b19d00eb8a8b3b0034a0321f22e8f32162bf4c2aebbce6da22c025f56e459ea2 android.hardware.graphics.composer@2.1::IComposerCallback
e992684e690dfe67a8cbeab5005bfa3fa9c2bf3d4b0b75657fb1f0c2d5dd2bae android.hardware.graphics.composer@2.1::IComposerClient

421
graphics/common/1.0/types.hal
View file

@ -505,26 +505,29 @@ enum BufferUsage : uint64_t {
/**
* Transformation definitions
*
* IMPORTANT NOTE:
* ROT_90 is applied CLOCKWISE and AFTER FLIP_{H|V}.
*
*/
@export(name="android_transform_t", value_prefix="HAL_TRANSFORM_")
enum Transform : int32_t {
/** flip source image horizontally (around the vertical axis) */
FLIP_H = 0x01,
/**
* flip source image vertically (around the horizontal axis)*/
FLIP_V = 0x02,
/** rotate source image 90 degrees clockwise */
ROT_90 = 0x04,
/** rotate source image 180 degrees */
ROT_180 = 0x03,
/** rotate source image 270 degrees clockwise */
ROT_270 = 0x07,
* Horizontal flip. FLIP_H/FLIP_V is applied before ROT_90.
*/
FLIP_H = 1 << 0,
/** 0x08 is reserved */
/**
* Vertical flip. FLIP_H/FLIP_V is applied before ROT_90.
*/
FLIP_V = 1 << 1,
/**
* 90 degree clockwise rotation. FLIP_H/FLIP_V is applied before ROT_90.
*/
ROT_90 = 1 << 2,
/**
* Commonly used combinations.
*/
ROT_180 = FLIP_H | FLIP_V,
ROT_270 = FLIP_H | FLIP_V | ROT_90,
};
/**
@ -1222,209 +1225,209 @@ enum Dataspace : int32_t {
*/
@export(name="android_color_mode_t", value_prefix="HAL_COLOR_MODE_")
enum ColorMode : int32_t {
/**
* DEFAULT is the "native" gamut of the display.
* White Point: Vendor/OEM defined
* Panel Gamma: Vendor/OEM defined (typically 2.2)
* Rendering Intent: Vendor/OEM defined (typically 'enhanced')
*/
NATIVE = 0,
/**
* DEFAULT is the "native" gamut of the display.
* White Point: Vendor/OEM defined
* Panel Gamma: Vendor/OEM defined (typically 2.2)
* Rendering Intent: Vendor/OEM defined (typically 'enhanced')
*/
NATIVE = 0,
/**
* STANDARD_BT601_625 corresponds with display
* settings that implement the ITU-R Recommendation BT.601
* or Rec 601. Using 625 line version
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.290 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* KR = 0.299, KB = 0.114. This adjusts the luminance interpretation
* for RGB conversion from the one purely determined by the primaries
* to minimize the color shift into RGB space that uses BT.709
* primaries.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_625 = 1,
/**
* STANDARD_BT601_625 corresponds with display
* settings that implement the ITU-R Recommendation BT.601
* or Rec 601. Using 625 line version
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.290 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* KR = 0.299, KB = 0.114. This adjusts the luminance interpretation
* for RGB conversion from the one purely determined by the primaries
* to minimize the color shift into RGB space that uses BT.709
* primaries.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_625 = 1,
/**
* Primaries:
* x y
* green 0.290 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* Use the unadjusted KR = 0.222, KB = 0.071 luminance interpretation
* for RGB conversion.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_625_UNADJUSTED = 2,
/**
* Primaries:
* x y
* green 0.290 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* Use the unadjusted KR = 0.222, KB = 0.071 luminance interpretation
* for RGB conversion.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_625_UNADJUSTED = 2,
/**
* Primaries:
* x y
* green 0.310 0.595
* blue 0.155 0.070
* red 0.630 0.340
* white (D65) 0.3127 0.3290
*
* KR = 0.299, KB = 0.114. This adjusts the luminance interpretation
* for RGB conversion from the one purely determined by the primaries
* to minimize the color shift into RGB space that uses BT.709
* primaries.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_525 = 3,
/**
* Primaries:
* x y
* green 0.310 0.595
* blue 0.155 0.070
* red 0.630 0.340
* white (D65) 0.3127 0.3290
*
* KR = 0.299, KB = 0.114. This adjusts the luminance interpretation
* for RGB conversion from the one purely determined by the primaries
* to minimize the color shift into RGB space that uses BT.709
* primaries.
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_525 = 3,
/**
* Primaries:
* x y
* green 0.310 0.595
* blue 0.155 0.070
* red 0.630 0.340
* white (D65) 0.3127 0.3290
*
* Use the unadjusted KR = 0.212, KB = 0.087 luminance interpretation
* for RGB conversion (as in SMPTE 240M).
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_525_UNADJUSTED = 4,
/**
* Primaries:
* x y
* green 0.310 0.595
* blue 0.155 0.070
* red 0.630 0.340
* white (D65) 0.3127 0.3290
*
* Use the unadjusted KR = 0.212, KB = 0.087 luminance interpretation
* for RGB conversion (as in SMPTE 240M).
*
* Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.500 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear)^(0.45) – 0.099
*/
STANDARD_BT601_525_UNADJUSTED = 4,
/**
* REC709 corresponds with display settings that implement
* the ITU-R Recommendation BT.709 / Rec. 709 for high-definition television.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.300 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* HDTV REC709 Inverse Gamma Correction (IGC): V represents normalized
* (with [0 to 1] range) value of R, G, or B.
*
* if Vnonlinear < 0.081
* Vlinear = Vnonlinear / 4.5
* else
* Vlinear = ((Vnonlinear + 0.099) / 1.099) ^ (1/0.45)
*
* HDTV REC709 Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.5 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear) ^ 0.45 – 0.099
*/
STANDARD_BT709 = 5,
/**
* REC709 corresponds with display settings that implement
* the ITU-R Recommendation BT.709 / Rec. 709 for high-definition television.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.300 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* HDTV REC709 Inverse Gamma Correction (IGC): V represents normalized
* (with [0 to 1] range) value of R, G, or B.
*
* if Vnonlinear < 0.081
* Vlinear = Vnonlinear / 4.5
* else
* Vlinear = ((Vnonlinear + 0.099) / 1.099) ^ (1/0.45)
*
* HDTV REC709 Gamma Correction (GC):
*
* if Vlinear < 0.018
* Vnonlinear = 4.5 * Vlinear
* else
* Vnonlinear = 1.099 * (Vlinear) ^ 0.45 – 0.099
*/
STANDARD_BT709 = 5,
/**
* DCI_P3 corresponds with display settings that implement
* SMPTE EG 432-1 and SMPTE RP 431-2
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.265 0.690
* blue 0.150 0.060
* red 0.680 0.320
* white (D65) 0.3127 0.3290
*
* Gamma: 2.6
*/
DCI_P3 = 6,
/**
* DCI_P3 corresponds with display settings that implement
* SMPTE EG 432-1 and SMPTE RP 431-2
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.265 0.690
* blue 0.150 0.060
* red 0.680 0.320
* white (D65) 0.3127 0.3290
*
* Gamma: 2.6
*/
DCI_P3 = 6,
/**
* SRGB corresponds with display settings that implement
* the sRGB color space. Uses the same primaries as ITU-R Recommendation
* BT.709
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.300 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* PC/Internet (sRGB) Inverse Gamma Correction (IGC):
*
* if Vnonlinear ≤ 0.03928
* Vlinear = Vnonlinear / 12.92
* else
* Vlinear = ((Vnonlinear + 0.055)/1.055) ^ 2.4
*
* PC/Internet (sRGB) Gamma Correction (GC):
*
* if Vlinear ≤ 0.0031308
* Vnonlinear = 12.92 * Vlinear
* else
* Vnonlinear = 1.055 * (Vlinear)^(1/2.4) – 0.055
*/
SRGB = 7,
/**
* SRGB corresponds with display settings that implement
* the sRGB color space. Uses the same primaries as ITU-R Recommendation
* BT.709
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.300 0.600
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* PC/Internet (sRGB) Inverse Gamma Correction (IGC):
*
* if Vnonlinear ≤ 0.03928
* Vlinear = Vnonlinear / 12.92
* else
* Vlinear = ((Vnonlinear + 0.055)/1.055) ^ 2.4
*
* PC/Internet (sRGB) Gamma Correction (GC):
*
* if Vlinear ≤ 0.0031308
* Vnonlinear = 12.92 * Vlinear
* else
* Vnonlinear = 1.055 * (Vlinear)^(1/2.4) – 0.055
*/
SRGB = 7,
/**
* ADOBE_RGB corresponds with the RGB color space developed
* by Adobe Systems, Inc. in 1998.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.210 0.710
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* Gamma: 2.2
*/
ADOBE_RGB = 8,
/**
* ADOBE_RGB corresponds with the RGB color space developed
* by Adobe Systems, Inc. in 1998.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.210 0.710
* blue 0.150 0.060
* red 0.640 0.330
* white (D65) 0.3127 0.3290
*
* Gamma: 2.2
*/
ADOBE_RGB = 8,
/**
* DISPLAY_P3 is a color space that uses the DCI_P3 primaries,
* the D65 white point and the SRGB transfer functions.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.265 0.690
* blue 0.150 0.060
* red 0.680 0.320
* white (D65) 0.3127 0.3290
*
* PC/Internet (sRGB) Gamma Correction (GC):
*
* if Vlinear ≤ 0.0030186
* Vnonlinear = 12.92 * Vlinear
* else
* Vnonlinear = 1.055 * (Vlinear)^(1/2.4) – 0.055
*
* Note: In most cases sRGB transfer function will be fine.
*/
DISPLAY_P3 = 9
/**
* DISPLAY_P3 is a color space that uses the DCI_P3 primaries,
* the D65 white point and the SRGB transfer functions.
* Rendering Intent: Colorimetric
* Primaries:
* x y
* green 0.265 0.690
* blue 0.150 0.060
* red 0.680 0.320
* white (D65) 0.3127 0.3290
*
* PC/Internet (sRGB) Gamma Correction (GC):
*
* if Vlinear ≤ 0.0030186
* Vnonlinear = 12.92 * Vlinear
* else
* Vnonlinear = 1.055 * (Vlinear)^(1/2.4) – 0.055
*
* Note: In most cases sRGB transfer function will be fine.
*/
DISPLAY_P3 = 9
};
/**