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

Commit a4f7864f authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Skia HLG should scale to [0, 1] instead of [0, 12]" into tm-dev am:... 

Merge "Skia HLG should scale to [0, 1] instead of [0, 12]" into tm-dev am: 30770400 am: b05748b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17575047



Change-Id: I4f647e0f6508d5b3e6984caeb3408e5c81fa1f43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e170502 b05748b7

libs/renderengine/skia/ColorSpaces.cpp

+9 −1
Original line number Diff line number Diff line
@@ -65,7 +65,15 @@ sk_sp<SkColorSpace> toSkColorSpace(ui::Dataspace dataspace) { 
        case HAL_DATASPACE_TRANSFER_SMPTE_170M:

            return SkColorSpace::MakeRGB(SkNamedTransferFn::kRec2020, gamut);

        case HAL_DATASPACE_TRANSFER_HLG:

            return SkColorSpace::MakeRGB(SkNamedTransferFn::kHLG, gamut);

            // return HLG transfer but scale by 1/12

            skcms_TransferFunction hlgFn;

            if (skcms_TransferFunction_makeScaledHLGish(&hlgFn, 1.f / 12.f, 2.f, 2.f,

                                                        1.f / 0.17883277f, 0.28466892f,

                                                        0.55991073f)) {

                return SkColorSpace::MakeRGB(hlgFn, gamut);

            } else {

                return SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, gamut);

            }

        case HAL_DATASPACE_TRANSFER_UNSPECIFIED:

        default:

            return SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, gamut);