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

Commit 419fb440 authored by Jooyung Han's avatar Jooyung Han
Browse files

Move PublicFormat from libandroid_runtime to libui 

PublicFormat is defined in android_view_Surface.
However this and related functions are also used in libmediandk
which is both NDK and LL-NDK. As a LL-NDK it should run without
libandroid_runtime.

By moving PublicFormat definition and its utility functions
into libui, LL-NDK can use it without cost of libandroid_runtime.
And also PublicFormat will be deprecated(b/126594675).

This is a part cutting dependency from libmediandk to
libandroid_runtime.

Note: applied clang-format

Bug: 124268753
Test: m -j
Change-Id: I7215dde607b425f7a0d47a6541b83fbe3a0deaf4
parent b73a2e3c

libs/ui/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ cc_library_shared { 


        // Don't warn about struct padding

        "-Wno-padded",



        "-Wno-switch-enum",

    ],



    sanitize: {
@@ -68,6 +70,7 @@ cc_library_shared { 
        "GraphicBufferMapper.cpp",

        "HdrCapabilities.cpp",

        "PixelFormat.cpp",

        "PublicFormat.cpp",

        "Rect.cpp",

        "Region.cpp",

        "Size.cpp",

libs/ui/PublicFormat.cpp

0 → 100644
+155 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <ui/GraphicTypes.h> // ui::Dataspace

#include <ui/PublicFormat.h>



// ----------------------------------------------------------------------------

namespace android {

// ----------------------------------------------------------------------------



using ui::Dataspace;



int mapPublicFormatToHalFormat(PublicFormat f) {

    switch (f) {

        case PublicFormat::JPEG:

        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH_JPEG:

        case PublicFormat::HEIC:

            return HAL_PIXEL_FORMAT_BLOB;

        case PublicFormat::DEPTH16:

            return HAL_PIXEL_FORMAT_Y16;

        case PublicFormat::RAW_SENSOR:

        case PublicFormat::RAW_DEPTH:

            return HAL_PIXEL_FORMAT_RAW16;

        default:

            // Most formats map 1:1

            return static_cast<int>(f);

    }

}



android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) {

    Dataspace dataspace;

    switch (f) {

        case PublicFormat::JPEG:

            dataspace = Dataspace::V0_JFIF;

            break;

        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH16:

        case PublicFormat::RAW_DEPTH:

            dataspace = Dataspace::DEPTH;

            break;

        case PublicFormat::RAW_SENSOR:

        case PublicFormat::RAW_PRIVATE:

        case PublicFormat::RAW10:

        case PublicFormat::RAW12:

            dataspace = Dataspace::ARBITRARY;

            break;

        case PublicFormat::YUV_420_888:

        case PublicFormat::NV21:

        case PublicFormat::YV12:

            dataspace = Dataspace::V0_JFIF;

            break;

        case PublicFormat::DEPTH_JPEG:

            dataspace = Dataspace::DYNAMIC_DEPTH;

            break;

        case PublicFormat::HEIC:

            dataspace = Dataspace::HEIF;

            break;

        default:

            // Most formats map to UNKNOWN

            dataspace = Dataspace::UNKNOWN;

            break;

    }

    return static_cast<android_dataspace>(dataspace);

}



PublicFormat mapHalFormatDataspaceToPublicFormat(int format, android_dataspace dataSpace) {

    Dataspace ds = static_cast<Dataspace>(dataSpace);

    switch (format) {

        case HAL_PIXEL_FORMAT_RGBA_8888:

        case HAL_PIXEL_FORMAT_RGBX_8888:

        case HAL_PIXEL_FORMAT_RGBA_FP16:

        case HAL_PIXEL_FORMAT_RGBA_1010102:

        case HAL_PIXEL_FORMAT_RGB_888:

        case HAL_PIXEL_FORMAT_RGB_565:

        case HAL_PIXEL_FORMAT_Y8:

        case HAL_PIXEL_FORMAT_RAW10:

        case HAL_PIXEL_FORMAT_RAW12:

        case HAL_PIXEL_FORMAT_YCbCr_420_888:

        case HAL_PIXEL_FORMAT_YV12:

            // Enums overlap in both name and value

            return static_cast<PublicFormat>(format);

        case HAL_PIXEL_FORMAT_RAW16:

            switch (ds) {

                case Dataspace::DEPTH:

                    return PublicFormat::RAW_DEPTH;

                default:

                    return PublicFormat::RAW_SENSOR;

            }

        case HAL_PIXEL_FORMAT_RAW_OPAQUE:

            // Name differs, though value is the same

            return PublicFormat::RAW_PRIVATE;

        case HAL_PIXEL_FORMAT_YCbCr_422_SP:

            // Name differs, though the value is the same

            return PublicFormat::NV16;

        case HAL_PIXEL_FORMAT_YCrCb_420_SP:

            // Name differs, though the value is the same

            return PublicFormat::NV21;

        case HAL_PIXEL_FORMAT_YCbCr_422_I:

            // Name differs, though the value is the same

            return PublicFormat::YUY2;

        case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:

            // Name differs, though the value is the same

            return PublicFormat::PRIVATE;

        case HAL_PIXEL_FORMAT_Y16:

            // Dataspace-dependent

            switch (ds) {

                case Dataspace::DEPTH:

                    return PublicFormat::DEPTH16;

                default:

                    // Assume non-depth Y16 is just Y16.

                    return PublicFormat::Y16;

            }

        case HAL_PIXEL_FORMAT_BLOB:

            // Dataspace-dependent

            switch (ds) {

                case Dataspace::DEPTH:

                    return PublicFormat::DEPTH_POINT_CLOUD;

                case Dataspace::V0_JFIF:

                    return PublicFormat::JPEG;

                case Dataspace::HEIF:

                    return PublicFormat::HEIC;

                default:

                    if (dataSpace == static_cast<android_dataspace>(HAL_DATASPACE_DYNAMIC_DEPTH)) {

                        return PublicFormat::DEPTH_JPEG;

                    } else {

                        // Assume otherwise-marked blobs are also JPEG

                        return PublicFormat::JPEG;

                    }

            }

        case HAL_PIXEL_FORMAT_BGRA_8888:

            // Not defined in public API

            return PublicFormat::UNKNOWN;



        default:

            return PublicFormat::UNKNOWN;

    }

}



// ----------------------------------------------------------------------------

}; // namespace android

// ----------------------------------------------------------------------------

libs/ui/include/ui/PublicFormat.h

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef UI_PUBLICFORMAT_H

#define UI_PUBLICFORMAT_H



#include <system/graphics.h>



namespace android {



/**

 * Enum mirroring the public API definitions for image and pixel formats.

 * Some of these are hidden in the public API

 *

 * Keep up to date with android.graphics.ImageFormat and

 * android.graphics.PixelFormat

 *

 * TODO: PublicFormat is going to be deprecated(b/126594675)

 */

enum class PublicFormat {

    UNKNOWN = 0x0,

    RGBA_8888 = 0x1,

    RGBX_8888 = 0x2,

    RGB_888 = 0x3,

    RGB_565 = 0x4,

    NV16 = 0x10,

    NV21 = 0x11,

    YUY2 = 0x14,

    RGBA_FP16 = 0x16,

    RAW_SENSOR = 0x20,

    PRIVATE = 0x22,

    YUV_420_888 = 0x23,

    RAW_PRIVATE = 0x24,

    RAW10 = 0x25,

    RAW12 = 0x26,

    RGBA_1010102 = 0x2b,

    JPEG = 0x100,

    DEPTH_POINT_CLOUD = 0x101,

    RAW_DEPTH = 0x1002, // @hide

    YV12 = 0x32315659,

    Y8 = 0x20203859,

    Y16 = 0x20363159, // @hide

    DEPTH16 = 0x44363159,

    DEPTH_JPEG = 0x69656963,

    HEIC = 0x48454946,

};



/* Convert from android.graphics.ImageFormat/PixelFormat enums to graphics.h HAL

 * format */

extern int mapPublicFormatToHalFormat(PublicFormat f);



/* Convert from android.graphics.ImageFormat/PixelFormat enums to graphics.h HAL

 * dataspace */

extern android_dataspace mapPublicFormatToHalDataspace(PublicFormat f);



/* Convert from HAL format, dataspace pair to

 * android.graphics.ImageFormat/PixelFormat.

 * For unknown/unspecified pairs, returns PublicFormat::UNKNOWN */

extern PublicFormat mapHalFormatDataspaceToPublicFormat(int format, android_dataspace dataSpace);



}; // namespace android



#endif // UI_PUBLICFORMAT_H