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

Commit bc56d73a authored by Peiyong Lin's avatar Peiyong Lin Committed by android-build-merger
Browse files

Merge "[Graphics] Align Display P3 transfer function coefficients." 

am: fde18fac

Change-Id: I242a8f1ccf0d2b662d745a0a956da7e7c8e3d790
parents 1e69440d fde18fac

graphics/java/android/graphics/ColorSpace.java

+3 −3
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ public abstract class ColorSpace { 
         *     <tr>

         *         <td>Electro-optical transfer function (EOTF)</td>

         *         <td colspan="4">\(\begin{equation}

         *             C_{linear} = \begin{cases}\frac{C_{DisplayP3}}{12.92} & C_{sRGB} \lt 0.039 \\

         *             \left( \frac{C_{DisplayP3} + 0.055}{1.055} \right) ^{2.4} & C_{sRGB} \ge 0.039 \end{cases}

         *             C_{linear} = \begin{cases}\frac{C_{DisplayP3}}{12.92} & C_{sRGB} \lt 0.04045 \\

         *             \left( \frac{C_{DisplayP3} + 0.055}{1.055} \right) ^{2.4} & C_{sRGB} \ge 0.04045 \end{cases}

         *             \end{equation}\)

         *         </td>

         *     </tr>
@@ -1484,7 +1484,7 @@ public abstract class ColorSpace { 
                "Display P3",

                new float[] { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f },

                ILLUMINANT_D65,

                new Rgb.TransferParameters(1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.039, 2.4),

                new Rgb.TransferParameters(1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.04045, 2.4),

                Named.DISPLAY_P3.ordinal()

        );

        sNamedColorSpaces[Named.NTSC_1953.ordinal()] = new ColorSpace.Rgb(