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

Commit e51d2fa4 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "Add DATASPACE_BT2020_HLG into DataSpace API."

parents 6ef2c449 6541a053

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16839,6 +16839,7 @@ package android.hardware { 
    method public static int pack(int, int, int);

    field public static final int DATASPACE_ADOBE_RGB = 151715840; // 0x90b0000

    field public static final int DATASPACE_BT2020 = 147193856; // 0x8c60000

    field public static final int DATASPACE_BT2020_HLG = 168165376; // 0xa060000

    field public static final int DATASPACE_BT2020_PQ = 163971072; // 0x9c60000

    field public static final int DATASPACE_BT601_525 = 281280512; // 0x10c40000

    field public static final int DATASPACE_BT601_625 = 281149440; // 0x10c20000

core/java/android/hardware/DataSpace.java

+13 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ public final class DataSpace { 
        DATASPACE_SRGB,

        DATASPACE_SCRGB,

        DATASPACE_DISPLAY_P3,

        DATASPACE_BT2020_HLG,

        DATASPACE_BT2020_PQ,

        DATASPACE_ADOBE_RGB,

        DATASPACE_JFIF,
@@ -471,6 +472,18 @@ public final class DataSpace { 
     *   Range: RANGE_FULL</pre>

     */

    public static final int DATASPACE_DISPLAY_P3 = 143261696;



    /**

     * Hybrid Log Gamma encoding.

     *

     * <p>Composed of the following -</p>

     * <pre>

     *   Primaries: STANDARD_BT2020

     *   Transfer: TRANSFER_HLG

     *   Range: RANGE_FULL</pre>

     */

    public static final int DATASPACE_BT2020_HLG = 168165376;



    /**

     * ITU-R Recommendation 2020 (BT.2020)

     *