Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94cd7bf9 authored by Alec Mouri's avatar Alec Mouri
Browse files

Add DISPLAY_BT2020 dataspace 

This already exists in AIDL, and will exist in the SDK

Bug: 355264141
Flag: EXEMPT NDK can't be flagged!
Test: builds
Change-Id: I32fd0e9d5c58363393d5217211d1f5fe9e14f86b
parent e23f11cc

libs/nativewindow/ANativeWindow.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;

libs/nativewindow/include/android/data_space.h

+7 −0
Original line number Diff line number Diff line
@@ -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