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

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

Merge changes from topic "hlgFix" into tm-mainline-prod am: 6b20cf74 

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



Change-Id: I03a175fae022645c2e4bf02d13faf57b7eefe3ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e7fe506 6b20cf74

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);