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

Commit 42fd1511 authored by Emilian Peev's avatar Emilian Peev
Browse files

PixelFormat: Add support for Jpeg/R 

Introduce support for a new Jpeg/R format that includes 10-bit recovery
map.

Bug: 241284696
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java#testJpegR

Change-Id: I8dfcbea8cf555e58aa9eb1f8fbfcb441edb8596c
parent 7d089caa

libs/ui/PublicFormat.cpp

+13 −6
Original line number Diff line number Diff line
@@ -14,14 +14,15 @@ 
 * limitations under the License.

 */



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

#include "aidl/android/hardware/graphics/common/Dataspace.h"

#include <ui/PublicFormat.h>





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

namespace android {

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



using ui::Dataspace;

using ::aidl::android::hardware::graphics::common::Dataspace;



int mapPublicFormatToHalFormat(PublicFormat f) {

    switch (f) {
@@ -29,6 +30,7 @@ int mapPublicFormatToHalFormat(PublicFormat f) { 
        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH_JPEG:

        case PublicFormat::HEIC:

        case PublicFormat::JPEG_R:

            return HAL_PIXEL_FORMAT_BLOB;

        case PublicFormat::DEPTH16:

            return HAL_PIXEL_FORMAT_Y16;
@@ -47,7 +49,7 @@ android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) { 
    Dataspace dataspace;

    switch (f) {

        case PublicFormat::JPEG:

            dataspace = Dataspace::V0_JFIF;

            dataspace = Dataspace::JFIF;

            break;

        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH16:
@@ -64,7 +66,7 @@ android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) { 
        case PublicFormat::YUV_420_888:

        case PublicFormat::NV21:

        case PublicFormat::YV12:

            dataspace = Dataspace::V0_JFIF;

            dataspace = Dataspace::JFIF;

            break;

        case PublicFormat::DEPTH_JPEG:

            dataspace = Dataspace::DYNAMIC_DEPTH;
@@ -72,6 +74,9 @@ android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) { 
        case PublicFormat::HEIC:

            dataspace = Dataspace::HEIF;

            break;

        case PublicFormat::JPEG_R:

            dataspace = Dataspace::JPEG_R;

            break;

        default:

            // Most formats map to UNKNOWN

            dataspace = Dataspace::UNKNOWN;
@@ -139,13 +144,15 @@ PublicFormat mapHalFormatDataspaceToPublicFormat(int format, android_dataspace d 
            switch (ds) {

                case Dataspace::DEPTH:

                    return PublicFormat::DEPTH_POINT_CLOUD;

                case Dataspace::V0_JFIF:

                case Dataspace::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 if (dataSpace == static_cast<android_dataspace>(Dataspace::JPEG_R)) {

                        return PublicFormat::JPEG_R;

                    }else {

                        // Assume otherwise-marked blobs are also JPEG

                        return PublicFormat::JPEG;

libs/ui/include/ui/PublicFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ enum class PublicFormat { 
    YCBCR_P010 = 0x36,

    DEPTH16 = 0x44363159,

    DEPTH_JPEG = 0x69656963,

    JPEG_R = 0x1005,

    HEIC = 0x48454946,

};