summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sally Qi <sallyqi@google.com> 2024-11-22 21:18:11 +0000
committer Sally Qi <sallyqi@google.com> 2024-11-22 21:18:11 +0000
commitc3cab95207ee962e30e80e48b5d86b0732e17664 (patch)
treeda5c40cd27ebbc39f142968e44e5453f7a62213c
parente255db9bf157cec4b7d31b89abe275d2ce295416 (diff)
[LUT NDK] Add CIE_Y sampling key to ADisplayLuts_SamplingKey enum.
Bug: 358422255 Change-Id: I33ffd8c9a843740653f7b838b426ba412aa292a1 Test: builds Flag: EXEMPT NDK
-rw-r--r--include/android/display_luts.h4
-rw-r--r--include/private/display_luts_private.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/include/android/display_luts.h b/include/android/display_luts.h
index 08dfb12d6c..eae2bfd351 100644
--- a/include/android/display_luts.h
+++ b/include/android/display_luts.h
@@ -43,6 +43,7 @@ typedef enum ADisplayLuts_Dimension ADisplayLuts_Dimension;
enum ADisplayLuts_SamplingKey : int32_t {
ADISPLAYLUTS_SAMPLINGKEY_RGB = 0,
ADISPLAYLUTS_SAMPLINGKEY_MAX_RGB = 1,
+ ADISPLAYLUTS_SAMPLINGKEY_CIE_Y = 2,
};
typedef enum ADisplayLuts_SamplingKey ADisplayLuts_SamplingKey;
@@ -74,7 +75,8 @@ typedef struct ADisplayLuts ADisplayLuts;
* @return a new \a ADisplayLutsEntry instance.
*/
ADisplayLutsEntry* _Nonnull ADisplayLutsEntry_createEntry(float* _Nonnull buffer,
- int32_t length, int32_t dimension, int32_t key) __INTRODUCED_IN(36);
+ int32_t length, ADisplayLuts_Dimension dimension, ADisplayLuts_SamplingKey key)
+ __INTRODUCED_IN(36);
/**
* Destroy the \a ADisplayLutsEntry instance.
diff --git a/include/private/display_luts_private.h b/include/private/display_luts_private.h
index 240e1f98cf..c347a0c85d 100644
--- a/include/private/display_luts_private.h
+++ b/include/private/display_luts_private.h
@@ -16,6 +16,7 @@
#pragma once
+#include <android/display_luts.h>
#include <stdint.h>
#include <vector>
#include <utils/RefBase.h>
@@ -29,9 +30,9 @@ struct ADisplayLutsEntry_buffer {
};
struct ADisplayLutsEntry_properties {
- int32_t dimension;
+ ADisplayLuts_Dimension dimension;
int32_t size;
- int32_t samplingKey;
+ ADisplayLuts_SamplingKey samplingKey;
};
struct ADisplayLutsEntry: public RefBase {