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

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

Merge "Fix Photos crash when open 10-bit HDR videos" into tm-dev am: e3ebb21b 

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



Change-Id: Id51cb8d6915e43e7d37390bdf4ca1a595950732d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83c23c81 e3ebb21b

libs/hwui/utils/Color.cpp

+6 −4
Original line number Diff line number Diff line
@@ -399,10 +399,12 @@ skcms_TransferFunction GetPQSkTransferFunction(float sdr_white_level) { 
// Skia skcms' default HLG maps encoded [0, 1] to linear [1, 12] in order to follow ARIB

// but LinearEffect expects a decoded [0, 1] range instead to follow Rec 2100.

std::optional<skcms_TransferFunction> GetHLGScaleTransferFunction() {

    std::optional<skcms_TransferFunction> hlgFn = {};

    skcms_TransferFunction_makeScaledHLGish(&hlgFn.value(), 1.f / 12.f, 2.f, 2.f, 1.f / 0.17883277f,

                                            0.28466892f, 0.55991073f);

    return hlgFn;

    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 std::make_optional<skcms_TransferFunction>(hlgFn);

    }

    return {};

}



}  // namespace uirenderer