Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: bc56d73af2

Change-Id: Ib72ca917df3a778c4ad59dc46f672b482e8b62bf
This commit is contained in:
Peiyong Lin
2018-10-16 11:26:55 -07:00
committed by android-build-merger
parent f70e1edd6f bc56d73af2
commit 93cd653b22
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/ColorSpace.java
View File

@@ -472,8 +472,8 @@ public abstract class ColorSpace {
* <tr> * <tr>
* <td>Electro-optical transfer function (EOTF)</td> * <td>Electro-optical transfer function (EOTF)</td>
* <td colspan="4">\(\begin{equation} * <td colspan="4">\(\begin{equation}
* C_{linear} = \begin{cases}\frac{C_{DisplayP3}}{12.92} & C_{sRGB} \lt 0.039 \\ * 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.039 \end{cases} * \left( \frac{C_{DisplayP3} + 0.055}{1.055} \right) ^{2.4} & C_{sRGB} \ge 0.04045 \end{cases}
* \end{equation}\) * \end{equation}\)
* </td> * </td>
* </tr> * </tr>
@@ -1484,7 +1484,7 @@ public abstract class ColorSpace {
"Display P3", "Display P3",
new float[] { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f }, new float[] { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f },
ILLUMINANT_D65, 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() Named.DISPLAY_P3.ordinal()
); );
sNamedColorSpaces[Named.NTSC_1953.ordinal()] = new ColorSpace.Rgb( sNamedColorSpaces[Named.NTSC_1953.ordinal()] = new ColorSpace.Rgb(