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

Commit 7ad5c2b4 authored by Emilian Peev's avatar Emilian Peev
Browse files

Add HEIC_ULTRAHDR image format 

Flag: com.android.internal.camera.flags.camera_heif_gainmap
Bug: 362608343
Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java#testHeicUltraHdr

Change-Id: Icefca1f6e1676b776a0b083fc7f6f8224cb72762
parent ff7a0f47

libs/ui/PublicFormat.cpp

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ int mapPublicFormatToHalFormat(PublicFormat f) { 
        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH_JPEG:

        case PublicFormat::HEIC:

        case PublicFormat::HEIC_ULTRAHDR:

        case PublicFormat::JPEG_R:

            return HAL_PIXEL_FORMAT_BLOB;

        case PublicFormat::DEPTH16:
@@ -74,6 +75,9 @@ android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) { 
        case PublicFormat::HEIC:

            dataspace = Dataspace::HEIF;

            break;

        case PublicFormat::HEIC_ULTRAHDR:

            dataspace = Dataspace::HEIF_ULTRAHDR;

            break;

        case PublicFormat::JPEG_R:

            dataspace = Dataspace::JPEG_R;

            break;
@@ -153,6 +157,9 @@ PublicFormat mapHalFormatDataspaceToPublicFormat(int format, android_dataspace d 
                        return PublicFormat::DEPTH_JPEG;

                    } else if (dataSpace == static_cast<android_dataspace>(Dataspace::JPEG_R)) {

                        return PublicFormat::JPEG_R;

                    } else if (dataSpace == static_cast<android_dataspace>(

                                Dataspace::HEIF_ULTRAHDR)) {

                        return PublicFormat::HEIC_ULTRAHDR;

                    }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
@@ -59,6 +59,7 @@ enum class PublicFormat { 
    DEPTH_JPEG = 0x69656963,

    JPEG_R = 0x1005,

    HEIC = 0x48454946,

    HEIC_ULTRAHDR = 0x1006,

};



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