commit 91a2b3d80488ea105cf2ca76375f54791ef701e0
author Peiyong Lin <lpy@google.com> Thu Dec 12 21:33:11 2019 -0800
committer Peiyong Lin <lpy@google.com> Tue Jan 07 15:34:05 2020 -0800
tree f086529457548a88411c10a385fff247c8456abd
parent e950a4e1e932e95b78e757be811ac8e85993bd47

Extend ADataspace.

In order to allow NDK image decoding to access more color spaces, extend
ADataspace to match Named.ColorSpace as many as possible.

BUG: b/140635413
Test: build
Change-Id: I8e06071060ab19b103900ff04d60f1c3d3fccda9

libs/nativewindow/ANativeWindow.cpp

diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp
index 0ba01f4..842af18 100644
--- a/libs/nativewindow/ANativeWindow.cpp
+++ b/libs/nativewindow/ANativeWindow.cpp
@@ -138,6 +138,11 @@
     static_assert(static_cast<int>(ADATASPACE_SCRGB) == static_cast<int>(HAL_DATASPACE_V0_SCRGB));
     static_assert(static_cast<int>(ADATASPACE_DISPLAY_P3) == static_cast<int>(HAL_DATASPACE_DISPLAY_P3));
     static_assert(static_cast<int>(ADATASPACE_BT2020_PQ) == static_cast<int>(HAL_DATASPACE_BT2020_PQ));
+    static_assert(static_cast<int>(ADATASPACE_ADOBE_RGB) == static_cast<int>(HAL_DATASPACE_ADOBE_RGB));
+    static_assert(static_cast<int>(ADATASPACE_BT2020) == static_cast<int>(HAL_DATASPACE_BT2020));
+    static_assert(static_cast<int>(ADATASPACE_BT709) == static_cast<int>(HAL_DATASPACE_V0_BT709));
+    static_assert(static_cast<int>(ADATASPACE_DCI_P3) == static_cast<int>(HAL_DATASPACE_DCI_P3));
+    static_assert(static_cast<int>(ADATASPACE_SRGB_LINEAR) == static_cast<int>(HAL_DATASPACE_V0_SRGB_LINEAR));
 
     if (!window || !query(window, NATIVE_WINDOW_IS_VALID) ||
             !isDataSpaceValid(window, dataSpace)) {