From 7d940ae4afa450696afa25e07982f3a95e17e9b2 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 6 Mar 2018 14:27:36 -0800 Subject: [PATCH] graphics: add render intents and new color modes Adds HAL_COLOR_MODE_BT2020 = 10, HAL_COLOR_MODE_BT2100_PQ = 11, HAL_COLOR_MODE_BT2100_HLG = 12, HAL_DATASPACE_BT2020_ITU_HLG = 302383104, HAL_DATASPACE_BT2020_HLG = 168165376, HAL_RENDER_INTENT_COLORIMETRIC = 0, HAL_RENDER_INTENT_ENHANCE = 1, HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC = 2, HAL_RENDER_INTENT_TONE_MAP_ENHANCE = 3, by running update-base-files.sh. Bug: 73824924 Test: manual Change-Id: Ifde249074abf2228ebe016a38b5bcea8bccb5e9d --- libsystem/include/system/graphics-base-v1.0.h | 2 +- libsystem/include/system/graphics-base-v1.1.h | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libsystem/include/system/graphics-base-v1.0.h b/libsystem/include/system/graphics-base-v1.0.h index 987a39da7..44913cc61 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_ diff --git a/libsystem/include/system/graphics-base-v1.1.h b/libsystem/include/system/graphics-base-v1.1.h index 12d01c17f..f95b9ba21 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 @@ typedef enum { 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