commit e3447826a86d1c1d4b4ff32f2bd6239059575c49
author Chia-I Wu <olv@google.com> Mon Apr 02 22:22:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 22:22:28 2018 +0000
tree af02ae8d3da9403f90c49964fb065b551e6c1297
parent 9d1f78358a98515b96af808745d5f44e5b85ad72
parent 7d940ae4afa450696afa25e07982f3a95e17e9b2

Merge "graphics: add render intents and new color modes" into pi-dev

libsystem/include/system/graphics-base-v1.0.h

diff --git a/libsystem/include/system/graphics-base-v1.0.h b/libsystem/include/system/graphics-base-v1.0.h
index 987a39d..44913cc 100644
--- a/libsystem/include/system/graphics-base-v1.0.h
+++ b/libsystem/include/system/graphics-base-v1.0.h
@@ -1,6 +1,6 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 // Source: android.hardware.graphics.common@1.0
-// Root: android.hardware:hardware/interfaces
+// Location: hardware/interfaces/graphics/common/1.0/
 
 #ifndef HIDL_GENERATED_ANDROID_HARDWARE_GRAPHICS_COMMON_V1_0_EXPORTED_CONSTANTS_H_
 #define HIDL_GENERATED_ANDROID_HARDWARE_GRAPHICS_COMMON_V1_0_EXPORTED_CONSTANTS_H_

libsystem/include/system/graphics-base-v1.1.h

diff --git a/libsystem/include/system/graphics-base-v1.1.h b/libsystem/include/system/graphics-base-v1.1.h
index 12d01c1..f95b9ba 100644
--- a/libsystem/include/system/graphics-base-v1.1.h
+++ b/libsystem/include/system/graphics-base-v1.1.h
@@ -1,6 +1,6 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 // Source: android.hardware.graphics.common@1.1
-// Root: android.hardware:hardware/interfaces
+// Location: hardware/interfaces/graphics/common/1.1/
 
 #ifndef HIDL_GENERATED_ANDROID_HARDWARE_GRAPHICS_COMMON_V1_1_EXPORTED_CONSTANTS_H_
 #define HIDL_GENERATED_ANDROID_HARDWARE_GRAPHICS_COMMON_V1_1_EXPORTED_CONSTANTS_H_
@@ -24,8 +24,23 @@
         281411584,  // ((STANDARD_BT2020 | TRANSFER_SMPTE_170M) | RANGE_LIMITED)
     HAL_DATASPACE_BT2020_ITU_PQ =
         298188800,  // ((STANDARD_BT2020 | TRANSFER_ST2084) | RANGE_LIMITED)
+    HAL_DATASPACE_BT2020_ITU_HLG = 302383104,  // ((STANDARD_BT2020 | TRANSFER_HLG) | RANGE_LIMITED)
+    HAL_DATASPACE_BT2020_HLG = 168165376,      // ((STANDARD_BT2020 | TRANSFER_HLG) | RANGE_FULL)
 } android_dataspace_v1_1_t;
 
+typedef enum {
+    HAL_COLOR_MODE_BT2020 = 10,
+    HAL_COLOR_MODE_BT2100_PQ = 11,
+    HAL_COLOR_MODE_BT2100_HLG = 12,
+} android_color_mode_v1_1_t;
+
+typedef enum {
+    HAL_RENDER_INTENT_COLORIMETRIC = 0,
+    HAL_RENDER_INTENT_ENHANCE = 1,
+    HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC = 2,
+    HAL_RENDER_INTENT_TONE_MAP_ENHANCE = 3,
+} android_render_intent_v1_1_t;
+
 #ifdef __cplusplus
 }
 #endif