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

Commit cd053df2 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Automerger Merge Worker
Browse files

Merge "Don't attempt to tone map content that is already in range." into...

Merge "Don't attempt to tone map content that is already in range." into sc-dev am: 263d778a am: 3649c40c

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

Change-Id: I801459d21d9bc22f41edbf40ba8a2def5310a887
parents 8473a736 3649c40c
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -167,13 +167,12 @@ static void generateToneMapInterpolation(ui::Dataspace inputDataspace,

                                float nits = xyz.y;

                                // clamp to max input luminance
                                nits = clamp(nits, 0.0, maxInLumi);

                                // scale [0.0, maxInLumi] to [0.0, maxOutLumi]
                                // if the max input luminance is less than what we can output then
                                // no tone mapping is needed as all color values will be in range.
                                if (maxInLumi <= maxOutLumi) {
                                    return xyz * (maxOutLumi / maxInLumi);
                                    return xyz;
                                } else {

                                    // three control points
                                    const float x0 = 10.0;
                                    const float y0 = 17.0;