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

Commit e77820cb authored by Sally Qi's avatar Sally Qi
Browse files

Add prefix to newly introduced IntDef for DEPTH 

Bug: 235218604
Test: builds
Change-Id: Ia2b4be4ac2936b6e136d58d107ec0fe4f5b41a0e
parent c6c599d3

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