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

Commit 1c5e21b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add BT2020 HLG and variant into ADataSpace"

parents 10535a04 95770603

libs/nativewindow/ANativeWindow.cpp

+4 −0
Original line number Diff line number Diff line
@@ -170,6 +170,10 @@ int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpa 
    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));

    static_assert(static_cast<int>(ADATASPACE_BT2020_HLG) ==

        static_cast<int>(HAL_DATASPACE_BT2020_HLG));

    static_assert(static_cast<int>(ADATASPACE_BT2020_ITU_HLG) ==

        static_cast<int>(HAL_DATASPACE_BT2020_ITU_HLG));



    if (!window || !query(window, NATIVE_WINDOW_IS_VALID) ||

            !isDataSpaceValid(window, dataSpace)) {

libs/nativewindow/include/android/data_space.h

+14 −0
Original line number Diff line number Diff line
@@ -519,6 +519,20 @@ enum ADataSpace { 
     * components.

     */

    ADATASPACE_SRGB_LINEAR = 138477568, // STANDARD_BT709 | TRANSFER_LINEAR | RANGE_FULL



    /**

     * Hybrid Log Gamma encoding:

     *

     * Use full range, hybrid log gamma transfer and BT2020 standard.

     */

    ADATASPACE_BT2020_HLG = 168165376, // STANDARD_BT2020 | TRANSFER_HLG | RANGE_FULL



    /**

     * ITU Hybrid Log Gamma encoding:

     *

     * Use limited range, hybrid log gamma transfer and BT2020 standard.

     */

    ADATASPACE_BT2020_ITU_HLG = 302383104 // STANDARD_BT2020 | TRANSFER_HLG | RANGE_LIMITED

};



__END_DECLS