From 91a2b3d80488ea105cf2ca76375f54791ef701e0 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Thu, 12 Dec 2019 21:33:11 -0800 Subject: 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 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libs/nativewindow/ANativeWindow.cpp') diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp index 0ba01f4da4..842af18c8c 100644 --- a/libs/nativewindow/ANativeWindow.cpp +++ b/libs/nativewindow/ANativeWindow.cpp @@ -138,6 +138,11 @@ int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpa static_assert(static_cast(ADATASPACE_SCRGB) == static_cast(HAL_DATASPACE_V0_SCRGB)); static_assert(static_cast(ADATASPACE_DISPLAY_P3) == static_cast(HAL_DATASPACE_DISPLAY_P3)); static_assert(static_cast(ADATASPACE_BT2020_PQ) == static_cast(HAL_DATASPACE_BT2020_PQ)); + static_assert(static_cast(ADATASPACE_ADOBE_RGB) == static_cast(HAL_DATASPACE_ADOBE_RGB)); + static_assert(static_cast(ADATASPACE_BT2020) == static_cast(HAL_DATASPACE_BT2020)); + static_assert(static_cast(ADATASPACE_BT709) == static_cast(HAL_DATASPACE_V0_BT709)); + static_assert(static_cast(ADATASPACE_DCI_P3) == static_cast(HAL_DATASPACE_DCI_P3)); + static_assert(static_cast(ADATASPACE_SRGB_LINEAR) == static_cast(HAL_DATASPACE_V0_SRGB_LINEAR)); if (!window || !query(window, NATIVE_WINDOW_IS_VALID) || !isDataSpaceValid(window, dataSpace)) { -- cgit v1.2.3-59-g8ed1b