summaryrefslogtreecommitdiff
path: root/libs/nativewindow
diff options
context:
space:
mode:
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-11-14 00:14:04 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-11-14 00:14:04 +0000
commit3774e13e75e9a2bb40852dcad595f9fc36dc59ff (patch)
tree9eec7972359688aa02fc88350129674c73469bfe /libs/nativewindow
parent921762ca6916fdd3f2b413624a06b28bf0b981f0 (diff)
parente4002e31f2017682ec7892eda9418b4d88bc12d0 (diff)
Snap for 12651823 from e4002e31f2017682ec7892eda9418b4d88bc12d0 to 25Q1-release
Change-Id: I36ec23de55b6b5afe6ac7427cafd3dfb3766beb3
Diffstat (limited to 'libs/nativewindow')
-rw-r--r--libs/nativewindow/ANativeWindow.cpp2
-rw-r--r--libs/nativewindow/include/android/data_space.h7
2 files changed, 9 insertions, 0 deletions
diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp
index ac3a832168..5ce4076476 100644
--- a/libs/nativewindow/ANativeWindow.cpp
+++ b/libs/nativewindow/ANativeWindow.cpp
@@ -222,6 +222,8 @@ int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpa
static_cast<int>(HAL_DATASPACE_BT2020_ITU_HLG));
static_assert(static_cast<int>(ADATASPACE_DEPTH) == static_cast<int>(HAL_DATASPACE_DEPTH));
static_assert(static_cast<int>(ADATASPACE_DYNAMIC_DEPTH) == static_cast<int>(HAL_DATASPACE_DYNAMIC_DEPTH));
+ static_assert(static_cast<int>(ADATASPACE_DISPLAY_BT2020) ==
+ static_cast<int>(HAL_DATASPACE_DISPLAY_BT2020));
if (!window || !query(window, NATIVE_WINDOW_IS_VALID)) {
return -EINVAL;
diff --git a/libs/nativewindow/include/android/data_space.h b/libs/nativewindow/include/android/data_space.h
index 8056d9ac4f..295a307c3c 100644
--- a/libs/nativewindow/include/android/data_space.h
+++ b/libs/nativewindow/include/android/data_space.h
@@ -578,6 +578,13 @@ enum ADataSpace : int32_t {
*/
ADATASPACE_BT2020_ITU_HLG = 302383104, // ADATASPACE_STANDARD_BT2020 | ADATASPACE_TRANSFER_HLG |
// ADATASPACE_RANGE_LIMITED
+ /**
+ * sRGB-encoded BT. 2020
+ *
+ * Uses full range, sRGB transfer and BT2020 standard.
+ */
+ ADATASPACE_DISPLAY_BT2020 = 142999552, // ADATASPACE_STANDARD_BT2020 | ADATASPACE_TRANSFER_SRGB
+ // | ADATASPACE_RANGE_FULL
/**
* Depth