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

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

Merge "Add prefix to newly introduced IntDef for DEPTH"

parents 050d4e5e e77820cb

libs/nativewindow/ANativeWindow.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -176,8 +176,8 @@ int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpa 
        static_cast<int>(HAL_DATASPACE_BT2020_HLG));

        static_cast<int>(HAL_DATASPACE_BT2020_HLG));

    static_assert(static_cast<int>(ADATASPACE_BT2020_ITU_HLG) ==

    static_assert(static_cast<int>(ADATASPACE_BT2020_ITU_HLG) ==

        static_cast<int>(HAL_DATASPACE_BT2020_ITU_HLG));

        static_cast<int>(HAL_DATASPACE_BT2020_ITU_HLG));

    static_assert(static_cast<int>(DEPTH) == static_cast<int>(HAL_DATASPACE_DEPTH));

    static_assert(static_cast<int>(ADATASPACE_DEPTH) == static_cast<int>(HAL_DATASPACE_DEPTH));

    static_assert(static_cast<int>(DYNAMIC_DEPTH) == static_cast<int>(HAL_DATASPACE_DYNAMIC_DEPTH));

    static_assert(static_cast<int>(ADATASPACE_DYNAMIC_DEPTH) == static_cast<int>(HAL_DATASPACE_DYNAMIC_DEPTH));





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

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

            !isDataSpaceValid(window, dataSpace)) {

            !isDataSpaceValid(window, dataSpace)) {

libs/nativewindow/include/android/data_space.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -548,14 +548,14 @@ enum ADataSpace { 
     *

     *

     * This value is valid with formats HAL_PIXEL_FORMAT_Y16 and HAL_PIXEL_FORMAT_BLOB.

     * This value is valid with formats HAL_PIXEL_FORMAT_Y16 and HAL_PIXEL_FORMAT_BLOB.

     */

     */

    DEPTH = 4096,

    ADATASPACE_DEPTH = 4096,





    /**

    /**

     * ISO 16684-1:2011(E) Dynamic Depth:

     * ISO 16684-1:2011(E) Dynamic Depth:

     *

     *

     * Embedded depth metadata following the dynamic depth specification.

     * Embedded depth metadata following the dynamic depth specification.

     */

     */

    DYNAMIC_DEPTH = 4098

    ADATASPACE_DYNAMIC_DEPTH = 4098

};

};





__END_DECLS

__END_DECLS